" where n is the color number from 0 to 7
- if c < 8 {
- return "4" + string('0'+c)
- } else {
- return "10" + string('0'+c-8)
+ switch c {
+ case Black:
+ return blackBackgroundColorAttr
+ case Red:
+ return redBackgroundColorAttr
+ case Green:
+ return greenBackgroundColorAttr
+ case Yellow:
+ return yellowBackgroundColorAttr
+ case Blue:
+ return blueBackgroundColorAttr
+ case Magenta:
+ return magentaBackgroundColorAttr
+ case Cyan:
+ return cyanBackgroundColorAttr
+ case White:
+ return whiteBackgroundColorAttr
+ case BrightBlack:
+ return brightBlackBackgroundColorAttr
+ case BrightRed:
+ return brightRedBackgroundColorAttr
+ case BrightGreen:
+ return brightGreenBackgroundColorAttr
+ case BrightYellow:
+ return brightYellowBackgroundColorAttr
+ case BrightBlue:
+ return brightBlueBackgroundColorAttr
+ case BrightMagenta:
+ return brightMagentaBackgroundColorAttr
+ case BrightCyan:
+ return brightCyanBackgroundColorAttr
+ case BrightWhite:
+ return brightWhiteBackgroundColorAttr
}
case ExtendedColor:
// 256-color ANSI foreground
@@ -259,13 +459,13 @@ func BackgroundColorAttr(c Color) Attr {
strconv.FormatUint(uint64(shift(g)), 10) + ";" +
strconv.FormatUint(uint64(shift(b)), 10)
}
- return DefaultBackgroundColorAttr
+ return defaultBackgroundColorAttr
}
-// UnderlineColorAttr returns the style SGR attribute for the given underline
+// underlineColorString returns the style SGR attribute for the given underline
// color.
// See: https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters
-func UnderlineColorAttr(c Color) Attr {
+func underlineColorString(c Color) string {
switch c := c.(type) {
// NOTE: we can't use 3-bit and 4-bit ANSI color codes with underline
// color, use 256-color instead.
@@ -285,7 +485,7 @@ func UnderlineColorAttr(c Color) Attr {
strconv.FormatUint(uint64(shift(g)), 10) + ";" +
strconv.FormatUint(uint64(shift(b)), 10)
}
- return DefaultUnderlineColorAttr
+ return defaultUnderlineColorAttr
}
func shift(v uint32) uint32 {
diff --git a/vendor/github.com/cloudflare/cloudflare-go/CHANGELOG.md b/vendor/github.com/cloudflare/cloudflare-go/CHANGELOG.md
index c208e1b2d2..ee95151596 100644
--- a/vendor/github.com/cloudflare/cloudflare-go/CHANGELOG.md
+++ b/vendor/github.com/cloudflare/cloudflare-go/CHANGELOG.md
@@ -1,4 +1,19 @@
-## 0.104.0 (Unreleased)
+## 0.105.0 (Unreleased)
+
+## 0.104.0 (September 11th, 2024)
+
+BREAKING CHANGES:
+
+* dns: removed deprecated `ZoneID` and `ZoneName` fields ([#2986](https://github.com/cloudflare/cloudflare-go/issues/2986))
+
+ENHANCEMENTS:
+
+* bot_management: add ai_bots_protection to public API ([#2974](https://github.com/cloudflare/cloudflare-go/issues/2974))
+
+DEPENDENCIES:
+
+* deps: bumps golang.org/x/net from 0.28.0 to 0.29.0 ([#3030](https://github.com/cloudflare/cloudflare-go/issues/3030))
+* deps: bumps golang.org/x/time from 0.5.0 to 0.6.0 ([#2816](https://github.com/cloudflare/cloudflare-go/issues/2816))
## 0.103.0 (August 28th, 2024)
diff --git a/vendor/github.com/cloudflare/cloudflare-go/bot_management.go b/vendor/github.com/cloudflare/cloudflare-go/bot_management.go
index f77968f459..51205a6aea 100644
--- a/vendor/github.com/cloudflare/cloudflare-go/bot_management.go
+++ b/vendor/github.com/cloudflare/cloudflare-go/bot_management.go
@@ -20,6 +20,7 @@ type BotManagement struct {
SuppressSessionScore *bool `json:"suppress_session_score,omitempty"`
AutoUpdateModel *bool `json:"auto_update_model,omitempty"`
UsingLatestModel *bool `json:"using_latest_model,omitempty"`
+ AIBotsProtection *string `json:"ai_bots_protection,omitempty"`
}
// BotManagementResponse represents the response from the bot_management endpoint.
@@ -38,6 +39,7 @@ type UpdateBotManagementParams struct {
OptimizeWordpress *bool `json:"optimize_wordpress,omitempty"`
SuppressSessionScore *bool `json:"suppress_session_score,omitempty"`
AutoUpdateModel *bool `json:"auto_update_model,omitempty"`
+ AIBotsProtection *string `json:"ai_bots_protection,omitempty"`
}
// GetBotManagement gets a zone API shield configuration.
diff --git a/vendor/github.com/cloudflare/cloudflare-go/dns.go b/vendor/github.com/cloudflare/cloudflare-go/dns.go
index 14dbe2d4b3..0c36efd429 100644
--- a/vendor/github.com/cloudflare/cloudflare-go/dns.go
+++ b/vendor/github.com/cloudflare/cloudflare-go/dns.go
@@ -27,8 +27,6 @@ type DNSRecord struct {
Meta interface{} `json:"meta,omitempty"`
Data interface{} `json:"data,omitempty"` // data returned by: SRV, LOC
ID string `json:"id,omitempty"`
- ZoneID string `json:"zone_id,omitempty"`
- ZoneName string `json:"zone_name,omitempty"`
Priority *uint16 `json:"priority,omitempty"`
TTL int `json:"ttl,omitempty"`
Proxied *bool `json:"proxied,omitempty"`
@@ -185,8 +183,6 @@ type CreateDNSRecordParams struct {
Meta interface{} `json:"meta,omitempty"`
Data interface{} `json:"data,omitempty"` // data returned by: SRV, LOC
ID string `json:"id,omitempty"`
- ZoneID string `json:"zone_id,omitempty"`
- ZoneName string `json:"zone_name,omitempty"`
Priority *uint16 `json:"priority,omitempty"`
TTL int `json:"ttl,omitempty"`
Proxied *bool `json:"proxied,omitempty" url:"proxied,omitempty"`
diff --git a/vendor/github.com/cloudflare/cloudflare-go/zone.go b/vendor/github.com/cloudflare/cloudflare-go/zone.go
index de92880a15..714c0edc8b 100644
--- a/vendor/github.com/cloudflare/cloudflare-go/zone.go
+++ b/vendor/github.com/cloudflare/cloudflare-go/zone.go
@@ -146,11 +146,12 @@ type ZoneRatePlanResponse struct {
// ZoneSetting contains settings for a zone.
type ZoneSetting struct {
- ID string `json:"id"`
- Editable bool `json:"editable"`
- ModifiedOn string `json:"modified_on,omitempty"`
- Value interface{} `json:"value"`
- TimeRemaining int `json:"time_remaining"`
+ ID string `json:"id"`
+ Editable bool `json:"editable"`
+ ModifiedOn string `json:"modified_on,omitempty"`
+ Value interface{} `json:"value"`
+ TimeRemaining int `json:"time_remaining"`
+ NextScheduledScan string `json:"next_scheduled_scan,omitempty"`
}
// ZoneSettingResponse represents the response from the Zone Setting endpoint.
@@ -175,7 +176,6 @@ type ZoneSSLSetting struct {
}
// ZoneSSLSettingResponse represents the response from the Zone SSL Setting
-// endpoint.
type ZoneSSLSettingResponse struct {
Response
Result ZoneSSLSetting `json:"result"`
diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/md2man/debug.go b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/debug.go
new file mode 100644
index 0000000000..0ec4b12c75
--- /dev/null
+++ b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/debug.go
@@ -0,0 +1,62 @@
+package md2man
+
+import (
+ "fmt"
+ "io"
+ "os"
+ "strings"
+
+ "github.com/russross/blackfriday/v2"
+)
+
+func fmtListFlags(flags blackfriday.ListType) string {
+ knownFlags := []struct {
+ name string
+ flag blackfriday.ListType
+ }{
+ {"ListTypeOrdered", blackfriday.ListTypeOrdered},
+ {"ListTypeDefinition", blackfriday.ListTypeDefinition},
+ {"ListTypeTerm", blackfriday.ListTypeTerm},
+ {"ListItemContainsBlock", blackfriday.ListItemContainsBlock},
+ {"ListItemBeginningOfList", blackfriday.ListItemBeginningOfList},
+ {"ListItemEndOfList", blackfriday.ListItemEndOfList},
+ }
+
+ var f []string
+ for _, kf := range knownFlags {
+ if flags&kf.flag != 0 {
+ f = append(f, kf.name)
+ flags &^= kf.flag
+ }
+ }
+ if flags != 0 {
+ f = append(f, fmt.Sprintf("Unknown(%#x)", flags))
+ }
+ return strings.Join(f, "|")
+}
+
+type debugDecorator struct {
+ blackfriday.Renderer
+}
+
+func depth(node *blackfriday.Node) int {
+ d := 0
+ for n := node.Parent; n != nil; n = n.Parent {
+ d++
+ }
+ return d
+}
+
+func (d *debugDecorator) RenderNode(w io.Writer, node *blackfriday.Node, entering bool) blackfriday.WalkStatus {
+ fmt.Fprintf(os.Stderr, "%s%s %v %v\n",
+ strings.Repeat(" ", depth(node)),
+ map[bool]string{true: "+", false: "-"}[entering],
+ node,
+ fmtListFlags(node.ListFlags))
+ var b strings.Builder
+ status := d.Renderer.RenderNode(io.MultiWriter(&b, w), node, entering)
+ if b.Len() > 0 {
+ fmt.Fprintf(os.Stderr, ">> %q\n", b.String())
+ }
+ return status
+}
diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go
index 42bf32aab0..62d91b77d5 100644
--- a/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go
+++ b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/md2man.go
@@ -1,16 +1,23 @@
package md2man
import (
+ "os"
+ "strconv"
+
"github.com/russross/blackfriday/v2"
)
// Render converts a markdown document into a roff formatted document.
func Render(doc []byte) []byte {
renderer := NewRoffRenderer()
+ var r blackfriday.Renderer = renderer
+ if v, _ := strconv.ParseBool(os.Getenv("MD2MAN_DEBUG")); v {
+ r = &debugDecorator{Renderer: r}
+ }
return blackfriday.Run(doc,
[]blackfriday.Option{
- blackfriday.WithRenderer(renderer),
+ blackfriday.WithRenderer(r),
blackfriday.WithExtensions(renderer.GetExtensions()),
}...)
}
diff --git a/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go
index 8a290f1972..9d6c473fdc 100644
--- a/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go
+++ b/vendor/github.com/cpuguy83/go-md2man/v2/md2man/roff.go
@@ -14,10 +14,8 @@ import (
// roffRenderer implements the blackfriday.Renderer interface for creating
// roff format (manpages) from markdown text
type roffRenderer struct {
- extensions blackfriday.Extensions
listCounters []int
firstHeader bool
- firstDD bool
listDepth int
}
@@ -43,7 +41,7 @@ const (
quoteTag = "\n.PP\n.RS\n"
quoteCloseTag = "\n.RE\n"
listTag = "\n.RS\n"
- listCloseTag = "\n.RE\n"
+ listCloseTag = ".RE\n"
dtTag = "\n.TP\n"
dd2Tag = "\n"
tableStart = "\n.TS\nallbox;\n"
@@ -56,23 +54,18 @@ const (
// NewRoffRenderer creates a new blackfriday Renderer for generating roff documents
// from markdown
func NewRoffRenderer() *roffRenderer { // nolint: golint
- var extensions blackfriday.Extensions
-
- extensions |= blackfriday.NoIntraEmphasis
- extensions |= blackfriday.Tables
- extensions |= blackfriday.FencedCode
- extensions |= blackfriday.SpaceHeadings
- extensions |= blackfriday.Footnotes
- extensions |= blackfriday.Titleblock
- extensions |= blackfriday.DefinitionLists
- return &roffRenderer{
- extensions: extensions,
- }
+ return &roffRenderer{}
}
// GetExtensions returns the list of extensions used by this renderer implementation
-func (r *roffRenderer) GetExtensions() blackfriday.Extensions {
- return r.extensions
+func (*roffRenderer) GetExtensions() blackfriday.Extensions {
+ return blackfriday.NoIntraEmphasis |
+ blackfriday.Tables |
+ blackfriday.FencedCode |
+ blackfriday.SpaceHeadings |
+ blackfriday.Footnotes |
+ blackfriday.Titleblock |
+ blackfriday.DefinitionLists
}
// RenderHeader handles outputting the header at document start
@@ -103,7 +96,23 @@ func (r *roffRenderer) RenderNode(w io.Writer, node *blackfriday.Node, entering
switch node.Type {
case blackfriday.Text:
- escapeSpecialChars(w, node.Literal)
+ // Special case: format the NAME section as required for proper whatis parsing.
+ // Refer to the lexgrog(1) and groff_man(7) manual pages for details.
+ if node.Parent != nil &&
+ node.Parent.Type == blackfriday.Paragraph &&
+ node.Parent.Prev != nil &&
+ node.Parent.Prev.Type == blackfriday.Heading &&
+ node.Parent.Prev.FirstChild != nil &&
+ bytes.EqualFold(node.Parent.Prev.FirstChild.Literal, []byte("NAME")) {
+ before, after, found := bytes.Cut(node.Literal, []byte(" - "))
+ escapeSpecialChars(w, before)
+ if found {
+ out(w, ` \- `)
+ escapeSpecialChars(w, after)
+ }
+ } else {
+ escapeSpecialChars(w, node.Literal)
+ }
case blackfriday.Softbreak:
out(w, crTag)
case blackfriday.Hardbreak:
@@ -141,14 +150,25 @@ func (r *roffRenderer) RenderNode(w io.Writer, node *blackfriday.Node, entering
case blackfriday.Document:
break
case blackfriday.Paragraph:
- // roff .PP markers break lists
- if r.listDepth > 0 {
- return blackfriday.GoToNext
- }
if entering {
- out(w, paraTag)
+ if r.listDepth > 0 {
+ // roff .PP markers break lists
+ if node.Prev != nil { // continued paragraph
+ if node.Prev.Type == blackfriday.List && node.Prev.ListFlags&blackfriday.ListTypeDefinition == 0 {
+ out(w, ".IP\n")
+ } else {
+ out(w, crTag)
+ }
+ }
+ } else if node.Prev != nil && node.Prev.Type == blackfriday.Heading {
+ out(w, crTag)
+ } else {
+ out(w, paraTag)
+ }
} else {
- out(w, crTag)
+ if node.Next == nil || node.Next.Type != blackfriday.List {
+ out(w, crTag)
+ }
}
case blackfriday.BlockQuote:
if entering {
@@ -211,6 +231,10 @@ func (r *roffRenderer) handleHeading(w io.Writer, node *blackfriday.Node, enteri
func (r *roffRenderer) handleList(w io.Writer, node *blackfriday.Node, entering bool) {
openTag := listTag
closeTag := listCloseTag
+ if (entering && r.listDepth == 0) || (!entering && r.listDepth == 1) {
+ openTag = crTag
+ closeTag = ""
+ }
if node.ListFlags&blackfriday.ListTypeDefinition != 0 {
// tags for definition lists handled within Item node
openTag = ""
@@ -239,23 +263,25 @@ func (r *roffRenderer) handleItem(w io.Writer, node *blackfriday.Node, entering
} else if node.ListFlags&blackfriday.ListTypeTerm != 0 {
// DT (definition term): line just before DD (see below).
out(w, dtTag)
- r.firstDD = true
} else if node.ListFlags&blackfriday.ListTypeDefinition != 0 {
// DD (definition description): line that starts with ": ".
//
// We have to distinguish between the first DD and the
// subsequent ones, as there should be no vertical
// whitespace between the DT and the first DD.
- if r.firstDD {
- r.firstDD = false
- } else {
- out(w, dd2Tag)
+ if node.Prev != nil && node.Prev.ListFlags&(blackfriday.ListTypeTerm|blackfriday.ListTypeDefinition) == blackfriday.ListTypeDefinition {
+ if node.Prev.Type == blackfriday.Item &&
+ node.Prev.LastChild != nil &&
+ node.Prev.LastChild.Type == blackfriday.List &&
+ node.Prev.LastChild.ListFlags&blackfriday.ListTypeDefinition == 0 {
+ out(w, ".IP\n")
+ } else {
+ out(w, dd2Tag)
+ }
}
} else {
out(w, ".IP \\(bu 2\n")
}
- } else {
- out(w, "\n")
}
}
diff --git a/vendor/github.com/dgraph-io/ristretto/.gitignore b/vendor/github.com/dgraph-io/ristretto/.gitignore
new file mode 100644
index 0000000000..64bd913847
--- /dev/null
+++ b/vendor/github.com/dgraph-io/ristretto/.gitignore
@@ -0,0 +1,3 @@
+# IDE
+.idea
+.vscode
\ No newline at end of file
diff --git a/vendor/github.com/dgraph-io/ristretto/cache.go b/vendor/github.com/dgraph-io/ristretto/cache.go
index 398ee14135..7a40b0e754 100644
--- a/vendor/github.com/dgraph-io/ristretto/cache.go
+++ b/vendor/github.com/dgraph-io/ristretto/cache.go
@@ -72,7 +72,7 @@ type Cache[K Key, V any] struct {
// stop is used to stop the processItems goroutine.
stop chan struct{}
// indicates whether cache is closed.
- isClosed bool
+ isClosed atomic.Bool
// cost calculates cost from a value.
cost func(value V) int64
// ignoreInternalCost dictates whether to ignore the cost of internally storing
@@ -221,7 +221,7 @@ func NewCache[K Key, V any](config *Config[K, V]) (*Cache[K, V], error) {
// Wait blocks until all buffered writes have been applied. This ensures a call to Set()
// will be visible to future calls to Get().
func (c *Cache[K, V]) Wait() {
- if c == nil || c.isClosed {
+ if c == nil || c.isClosed.Load() {
return
}
wg := &sync.WaitGroup{}
@@ -234,7 +234,7 @@ func (c *Cache[K, V]) Wait() {
// value was found or not. The value can be nil and the boolean can be true at
// the same time. Get will not return expired items.
func (c *Cache[K, V]) Get(key K) (V, bool) {
- if c == nil || c.isClosed {
+ if c == nil || c.isClosed.Load() {
return zeroValue[V](), false
}
keyHash, conflictHash := c.keyToHash(key)
@@ -267,7 +267,7 @@ func (c *Cache[K, V]) Set(key K, value V, cost int64) bool {
// expires, which is identical to calling Set. A negative value is a no-op and the value
// is discarded.
func (c *Cache[K, V]) SetWithTTL(key K, value V, cost int64, ttl time.Duration) bool {
- if c == nil || c.isClosed {
+ if c == nil || c.isClosed.Load() {
return false
}
@@ -316,7 +316,7 @@ func (c *Cache[K, V]) SetWithTTL(key K, value V, cost int64, ttl time.Duration)
// Del deletes the key-value item from the cache if it exists.
func (c *Cache[K, V]) Del(key K) {
- if c == nil || c.isClosed {
+ if c == nil || c.isClosed.Load() {
return
}
keyHash, conflictHash := c.keyToHash(key)
@@ -363,7 +363,7 @@ func (c *Cache[K, V]) GetTTL(key K) (time.Duration, bool) {
// Close stops all goroutines and closes all channels.
func (c *Cache[K, V]) Close() {
- if c == nil || c.isClosed {
+ if c == nil || c.isClosed.Load() {
return
}
c.Clear()
@@ -374,14 +374,14 @@ func (c *Cache[K, V]) Close() {
close(c.setBuf)
c.cachePolicy.Close()
c.cleanupTicker.Stop()
- c.isClosed = true
+ c.isClosed.Store(true)
}
// Clear empties the hashmap and zeroes all cachePolicy counters. Note that this is
// not an atomic operation (but that shouldn't be a problem as it's assumed that
// Set/Get calls won't be occurring until after this).
func (c *Cache[K, V]) Clear() {
- if c == nil || c.isClosed {
+ if c == nil || c.isClosed.Load() {
return
}
// Block until processItems goroutine is returned.
diff --git a/vendor/github.com/dgraph-io/ristretto/store.go b/vendor/github.com/dgraph-io/ristretto/store.go
index 3a53d593fc..e2ca800c17 100644
--- a/vendor/github.com/dgraph-io/ristretto/store.go
+++ b/vendor/github.com/dgraph-io/ristretto/store.go
@@ -111,6 +111,7 @@ func (sm *shardedMap[V]) Clear(onEvict func(item *Item[V])) {
for i := uint64(0); i < numShards; i++ {
sm.shards[i].Clear(onEvict)
}
+ sm.expiryMap.clear()
}
type lockedMap[V any] struct {
diff --git a/vendor/github.com/dgraph-io/ristretto/ttl.go b/vendor/github.com/dgraph-io/ristretto/ttl.go
index b71c1d80d2..08e77c1697 100644
--- a/vendor/github.com/dgraph-io/ristretto/ttl.go
+++ b/vendor/github.com/dgraph-io/ristretto/ttl.go
@@ -42,12 +42,14 @@ type bucket map[uint64]uint64
// expirationMap is a map of bucket number to the corresponding bucket.
type expirationMap[V any] struct {
sync.RWMutex
- buckets map[int64]bucket
+ buckets map[int64]bucket
+ lastCleanedBucketNum int64
}
func newExpirationMap[V any]() *expirationMap[V] {
return &expirationMap[V]{
- buckets: make(map[int64]bucket),
+ buckets: make(map[int64]bucket),
+ lastCleanedBucketNum: cleanupBucket(time.Now()),
}
}
@@ -87,6 +89,11 @@ func (m *expirationMap[_]) update(key, conflict uint64, oldExpTime, newExpTime t
delete(oldBucket, key)
}
+ // Items that don't expire don't need to be in the expiration map.
+ if newExpTime.IsZero() {
+ return
+ }
+
newBucketNum := storageBucket(newExpTime)
newBucket, ok := m.buckets[newBucketNum]
if !ok {
@@ -121,29 +128,50 @@ func (m *expirationMap[V]) cleanup(store store[V], policy policy[V], onEvict fun
m.Lock()
now := time.Now()
- bucketNum := cleanupBucket(now)
- keys := m.buckets[bucketNum]
- delete(m.buckets, bucketNum)
+ currentBucketNum := cleanupBucket(now)
+ // Clean up all buckets up to and including currentBucketNum, starting from
+ // (but not including) the last one that was cleaned up
+ var buckets []bucket
+ for bucketNum := m.lastCleanedBucketNum + 1; bucketNum <= currentBucketNum; bucketNum++ {
+ buckets = append(buckets, m.buckets[bucketNum])
+ delete(m.buckets, bucketNum)
+ }
+ m.lastCleanedBucketNum = currentBucketNum
m.Unlock()
- for key, conflict := range keys {
- expr := store.Expiration(key)
- // Sanity check. Verify that the store agrees that this key is expired.
- if expr.After(now) {
- continue
+ for _, keys := range buckets {
+ for key, conflict := range keys {
+ expr := store.Expiration(key)
+ // Sanity check. Verify that the store agrees that this key is expired.
+ if expr.After(now) {
+ continue
+ }
+
+ cost := policy.Cost(key)
+ policy.Del(key)
+ _, value := store.Del(key, conflict)
+
+ if onEvict != nil {
+ onEvict(&Item[V]{Key: key,
+ Conflict: conflict,
+ Value: value,
+ Cost: cost,
+ Expiration: expr,
+ })
+ }
}
+ }
+}
- cost := policy.Cost(key)
- policy.Del(key)
- _, value := store.Del(key, conflict)
-
- if onEvict != nil {
- onEvict(&Item[V]{Key: key,
- Conflict: conflict,
- Value: value,
- Cost: cost,
- Expiration: expr,
- })
- }
+// clear clears the expirationMap, the caller is responsible for properly
+// evicting the referenced items
+func (m *expirationMap[V]) clear() {
+ if m == nil {
+ return
}
+
+ m.Lock()
+ m.buckets = make(map[int64]bucket)
+ m.lastCleanedBucketNum = cleanupBucket(time.Now())
+ m.Unlock()
}
diff --git a/vendor/github.com/dgraph-io/ristretto/z/allocator.go b/vendor/github.com/dgraph-io/ristretto/z/allocator.go
index eae0f83449..dc272f68fc 100644
--- a/vendor/github.com/dgraph-io/ristretto/z/allocator.go
+++ b/vendor/github.com/dgraph-io/ristretto/z/allocator.go
@@ -56,9 +56,7 @@ func init() {
allocs = make(map[uint64]*Allocator)
// Set up a unique Ref per process.
- rand.Seed(time.Now().UnixNano())
- allocRef = uint64(rand.Int63n(1<<16)) << 48 //nolint:gosec // cryptographic precision not needed
-
+ allocRef = uint64(rand.Int63n(1<<16)) << 48
calculatedLog2 = make([]int, 1025)
for i := 1; i <= 1024; i++ {
calculatedLog2[i] = int(math.Log2(float64(i)))
diff --git a/vendor/github.com/dgraph-io/ristretto/z/mmap_js.go b/vendor/github.com/dgraph-io/ristretto/z/mmap_js.go
new file mode 100644
index 0000000000..d15b562960
--- /dev/null
+++ b/vendor/github.com/dgraph-io/ristretto/z/mmap_js.go
@@ -0,0 +1,40 @@
+//go:build js
+
+/*
+ * Copyright 2023 Dgraph Labs, Inc. and Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package z
+
+import (
+ "os"
+ "syscall"
+)
+
+func mmap(fd *os.File, writeable bool, size int64) ([]byte, error) {
+ return nil, syscall.ENOSYS
+}
+
+func munmap(b []byte) error {
+ return syscall.ENOSYS
+}
+
+func madvise(b []byte, readahead bool) error {
+ return syscall.ENOSYS
+}
+
+func msync(b []byte) error {
+ return syscall.ENOSYS
+}
diff --git a/vendor/github.com/dgraph-io/ristretto/z/mmap_linux.go b/vendor/github.com/dgraph-io/ristretto/z/mmap_linux.go
index 331330cff9..1d68f8fe82 100644
--- a/vendor/github.com/dgraph-io/ristretto/z/mmap_linux.go
+++ b/vendor/github.com/dgraph-io/ristretto/z/mmap_linux.go
@@ -1,3 +1,6 @@
+//go:build !js
+// +build !js
+
/*
* Copyright 2020 Dgraph Labs, Inc. and Contributors
*
diff --git a/vendor/github.com/dgraph-io/ristretto/z/mmap_unix.go b/vendor/github.com/dgraph-io/ristretto/z/mmap_unix.go
index 629449f9d3..13f2bb0c60 100644
--- a/vendor/github.com/dgraph-io/ristretto/z/mmap_unix.go
+++ b/vendor/github.com/dgraph-io/ristretto/z/mmap_unix.go
@@ -1,5 +1,5 @@
-//go:build !windows && !darwin && !plan9 && !linux && !wasip1
-// +build !windows,!darwin,!plan9,!linux,!wasip1
+//go:build !windows && !darwin && !plan9 && !linux && !wasip1 && !js
+// +build !windows,!darwin,!plan9,!linux,!wasip1,!js
/*
* Copyright 2019 Dgraph Labs, Inc. and Contributors
diff --git a/vendor/github.com/dgraph-io/ristretto/z/mremap_nosize.go b/vendor/github.com/dgraph-io/ristretto/z/mremap_nosize.go
index d31009a8b8..c052bebba8 100644
--- a/vendor/github.com/dgraph-io/ristretto/z/mremap_nosize.go
+++ b/vendor/github.com/dgraph-io/ristretto/z/mremap_nosize.go
@@ -1,6 +1,7 @@
-//go:build (arm64 || arm) && linux
+//go:build (arm64 || arm) && linux && !js
// +build arm64 arm
// +build linux
+// +build !js
/*
* Copyright 2020 Dgraph Labs, Inc. and Contributors
diff --git a/vendor/github.com/dgraph-io/ristretto/z/mremap_size.go b/vendor/github.com/dgraph-io/ristretto/z/mremap_size.go
index 35ff3ef177..958587d73f 100644
--- a/vendor/github.com/dgraph-io/ristretto/z/mremap_size.go
+++ b/vendor/github.com/dgraph-io/ristretto/z/mremap_size.go
@@ -1,5 +1,5 @@
-//go:build linux && !arm64 && !arm
-// +build linux,!arm64,!arm
+//go:build linux && !arm64 && !arm && !js
+// +build linux,!arm64,!arm,!js
/*
* Copyright 2020 Dgraph Labs, Inc. and Contributors
diff --git a/vendor/github.com/dop251/goja/parser/regexp.go b/vendor/github.com/dop251/goja/parser/regexp.go
index 0ea9b9d745..f455d0da29 100644
--- a/vendor/github.com/dop251/goja/parser/regexp.go
+++ b/vendor/github.com/dop251/goja/parser/regexp.go
@@ -194,6 +194,10 @@ func (self *_RegExp_parser) scanGroup() {
case '[':
self.scanBracket()
case '.':
+ if self.dotAll {
+ self.pass()
+ break
+ }
self.writeString(Re2Dot)
self.read()
default:
diff --git a/vendor/github.com/getsentry/sentry-go/CHANGELOG.md b/vendor/github.com/getsentry/sentry-go/CHANGELOG.md
index 046f49c466..dce9a3ff97 100644
--- a/vendor/github.com/getsentry/sentry-go/CHANGELOG.md
+++ b/vendor/github.com/getsentry/sentry-go/CHANGELOG.md
@@ -1,5 +1,47 @@
# Changelog
+## 0.29.0
+
+The Sentry SDK team is happy to announce the immediate availability of Sentry Go SDK v0.29.0.
+
+### Breaking Changes
+
+- Remove the `sentrymartini` integration ([#861](https://github.com/getsentry/sentry-go/pull/861))
+- The `WrapResponseWriter` has been moved from the `sentryhttp` package to the `internal/httputils` package. If you've imported it previosuly, you'll need to copy the implementation in your project. ([#871](https://github.com/getsentry/sentry-go/pull/871))
+
+### Features
+
+- Add new convenience methods to continue a trace and propagate tracing headers for error-only use cases. ([#862](https://github.com/getsentry/sentry-go/pull/862))
+
+ If you are not using one of our integrations, you can manually continue an incoming trace by using `sentry.ContinueTrace()` by providing the `sentry-trace` and `baggage` header received from a downstream SDK.
+
+ ```go
+ hub := sentry.CurrentHub()
+ sentry.ContinueTrace(hub, r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
+ ```
+
+ You can use `hub.GetTraceparent()` and `hub.GetBaggage()` to fetch the necessary header values for outgoing HTTP requests.
+
+ ```go
+ hub := sentry.GetHubFromContext(ctx)
+ req, _ := http.NewRequest("GET", "http://localhost:3000", nil)
+ req.Header.Add(sentry.SentryTraceHeader, hub.GetTraceparent())
+ req.Header.Add(sentry.SentryBaggageHeader, hub.GetBaggage())
+ ```
+
+### Bug Fixes
+
+- Initialize `HTTPTransport.limit` if `nil` ([#844](https://github.com/getsentry/sentry-go/pull/844))
+- Fix `sentry.StartTransaction()` returning a transaction with an outdated context on existing transactions ([#854](https://github.com/getsentry/sentry-go/pull/854))
+- Treat `Proxy-Authorization` as a sensitive header ([#859](https://github.com/getsentry/sentry-go/pull/859))
+- Add support for the `http.Hijacker` interface to the `sentrynegroni` package ([#871](https://github.com/getsentry/sentry-go/pull/871))
+- Go version >= 1.23: Use value from `http.Request.Pattern` for HTTP transaction names when using `sentryhttp` & `sentrynegroni` ([#875](https://github.com/getsentry/sentry-go/pull/875))
+- Go version >= 1.21: Fix closure functions name grouping ([#877](https://github.com/getsentry/sentry-go/pull/877))
+
+### Misc
+
+- Collect `span` origins ([#849](https://github.com/getsentry/sentry-go/pull/849))
+
## 0.28.1
The Sentry SDK team is happy to announce the immediate availability of Sentry Go SDK v0.28.1.
diff --git a/vendor/github.com/getsentry/sentry-go/README.md b/vendor/github.com/getsentry/sentry-go/README.md
index 73cbdbc637..3b67fb45a5 100644
--- a/vendor/github.com/getsentry/sentry-go/README.md
+++ b/vendor/github.com/getsentry/sentry-go/README.md
@@ -77,7 +77,6 @@ checkout the official documentation:
- [fasthttp](https://docs.sentry.io/platforms/go/guides/fasthttp/)
- [gin](https://docs.sentry.io/platforms/go/guides/gin/)
- [iris](https://docs.sentry.io/platforms/go/guides/iris/)
- - [martini](https://docs.sentry.io/platforms/go/guides/martini/)
- [negroni](https://docs.sentry.io/platforms/go/guides/negroni/)
## Resources
diff --git a/vendor/github.com/getsentry/sentry-go/client.go b/vendor/github.com/getsentry/sentry-go/client.go
index f5069b7167..b5b11b31dc 100644
--- a/vendor/github.com/getsentry/sentry-go/client.go
+++ b/vendor/github.com/getsentry/sentry-go/client.go
@@ -90,7 +90,7 @@ type EventProcessor func(event *Event, hint *EventHint) *Event
// ApplyToEvent changes an event based on external data and/or
// an event hint.
type EventModifier interface {
- ApplyToEvent(event *Event, hint *EventHint) *Event
+ ApplyToEvent(event *Event, hint *EventHint, client *Client) *Event
}
var globalEventProcessors []EventProcessor
@@ -685,7 +685,7 @@ func (client *Client) prepareEvent(event *Event, hint *EventHint, scope EventMod
}
if scope != nil {
- event = scope.ApplyToEvent(event, hint)
+ event = scope.ApplyToEvent(event, hint, client)
if event == nil {
return nil
}
diff --git a/vendor/github.com/getsentry/sentry-go/dynamic_sampling_context.go b/vendor/github.com/getsentry/sentry-go/dynamic_sampling_context.go
index 365072607a..6eec95ba15 100644
--- a/vendor/github.com/getsentry/sentry-go/dynamic_sampling_context.go
+++ b/vendor/github.com/getsentry/sentry-go/dynamic_sampling_context.go
@@ -39,8 +39,6 @@ func DynamicSamplingContextFromHeader(header []byte) (DynamicSamplingContext, er
}
func DynamicSamplingContextFromTransaction(span *Span) DynamicSamplingContext {
- entries := map[string]string{}
-
hub := hubFromContext(span.Context())
scope := hub.Scope()
client := hub.Client()
@@ -52,6 +50,8 @@ func DynamicSamplingContextFromTransaction(span *Span) DynamicSamplingContext {
}
}
+ entries := make(map[string]string)
+
if traceID := span.TraceID.String(); traceID != "" {
entries["trace_id"] = traceID
}
@@ -78,20 +78,9 @@ func DynamicSamplingContextFromTransaction(span *Span) DynamicSamplingContext {
}
}
- if userSegment := scope.user.Segment; userSegment != "" {
- entries["user_segment"] = userSegment
- }
-
- if span.Sampled.Bool() {
- entries["sampled"] = "true"
- } else {
- entries["sampled"] = "false"
- }
+ entries["sampled"] = strconv.FormatBool(span.Sampled.Bool())
- return DynamicSamplingContext{
- Entries: entries,
- Frozen: true,
- }
+ return DynamicSamplingContext{Entries: entries, Frozen: true}
}
func (d DynamicSamplingContext) HasEntries() bool {
@@ -121,3 +110,43 @@ func (d DynamicSamplingContext) String() string {
return ""
}
+
+// Constructs a new DynamicSamplingContext using a scope and client. Accessing
+// fields on the scope are not thread safe, and this function should only be
+// called within scope methods.
+func DynamicSamplingContextFromScope(scope *Scope, client *Client) DynamicSamplingContext {
+ entries := map[string]string{}
+
+ if client == nil || scope == nil {
+ return DynamicSamplingContext{
+ Entries: entries,
+ Frozen: false,
+ }
+ }
+
+ propagationContext := scope.propagationContext
+
+ if traceID := propagationContext.TraceID.String(); traceID != "" {
+ entries["trace_id"] = traceID
+ }
+ if sampleRate := client.options.TracesSampleRate; sampleRate != 0 {
+ entries["sample_rate"] = strconv.FormatFloat(sampleRate, 'f', -1, 64)
+ }
+
+ if dsn := client.dsn; dsn != nil {
+ if publicKey := dsn.publicKey; publicKey != "" {
+ entries["public_key"] = publicKey
+ }
+ }
+ if release := client.options.Release; release != "" {
+ entries["release"] = release
+ }
+ if environment := client.options.Environment; environment != "" {
+ entries["environment"] = environment
+ }
+
+ return DynamicSamplingContext{
+ Entries: entries,
+ Frozen: true,
+ }
+}
diff --git a/vendor/github.com/getsentry/sentry-go/hub.go b/vendor/github.com/getsentry/sentry-go/hub.go
index 6af1d5afa2..c99b6d70d1 100644
--- a/vendor/github.com/getsentry/sentry-go/hub.go
+++ b/vendor/github.com/getsentry/sentry-go/hub.go
@@ -2,6 +2,7 @@ package sentry
import (
"context"
+ "fmt"
"sync"
"time"
)
@@ -365,6 +366,34 @@ func (hub *Hub) Flush(timeout time.Duration) bool {
return client.Flush(timeout)
}
+// GetTraceparent returns the current Sentry traceparent string, to be used as a HTTP header value
+// or HTML meta tag value.
+// This function is context aware, as in it either returns the traceparent based
+// on the current span, or the scope's propagation context.
+func (hub *Hub) GetTraceparent() string {
+ scope := hub.Scope()
+
+ if scope.span != nil {
+ return scope.span.ToSentryTrace()
+ }
+
+ return fmt.Sprintf("%s-%s", scope.propagationContext.TraceID, scope.propagationContext.SpanID)
+}
+
+// GetBaggage returns the current Sentry baggage string, to be used as a HTTP header value
+// or HTML meta tag value.
+// This function is context aware, as in it either returns the baggage based
+// on the current span or the scope's propagation context.
+func (hub *Hub) GetBaggage() string {
+ scope := hub.Scope()
+
+ if scope.span != nil {
+ return scope.span.ToBaggage()
+ }
+
+ return scope.propagationContext.DynamicSamplingContext.String()
+}
+
// HasHubOnContext checks whether Hub instance is bound to a given Context struct.
func HasHubOnContext(ctx context.Context) bool {
_, ok := ctx.Value(HubContextKey).(*Hub)
diff --git a/vendor/github.com/getsentry/sentry-go/interfaces.go b/vendor/github.com/getsentry/sentry-go/interfaces.go
index 35686a02c9..cacb254368 100644
--- a/vendor/github.com/getsentry/sentry-go/interfaces.go
+++ b/vendor/github.com/getsentry/sentry-go/interfaces.go
@@ -166,10 +166,11 @@ type Request struct {
}
var sensitiveHeaders = map[string]struct{}{
- "Authorization": {},
- "Cookie": {},
- "X-Forwarded-For": {},
- "X-Real-Ip": {},
+ "Authorization": {},
+ "Proxy-Authorization": {},
+ "Cookie": {},
+ "X-Forwarded-For": {},
+ "X-Real-Ip": {},
}
// NewRequest returns a new Sentry Request from the given http.Request.
diff --git a/vendor/github.com/getsentry/sentry-go/propagation_context.go b/vendor/github.com/getsentry/sentry-go/propagation_context.go
new file mode 100644
index 0000000000..7a0766a8ad
--- /dev/null
+++ b/vendor/github.com/getsentry/sentry-go/propagation_context.go
@@ -0,0 +1,90 @@
+package sentry
+
+import (
+ "crypto/rand"
+ "encoding/json"
+)
+
+type PropagationContext struct {
+ TraceID TraceID `json:"trace_id"`
+ SpanID SpanID `json:"span_id"`
+ ParentSpanID SpanID `json:"parent_span_id"`
+ DynamicSamplingContext DynamicSamplingContext `json:"-"`
+}
+
+func (p PropagationContext) MarshalJSON() ([]byte, error) {
+ type propagationContext PropagationContext
+ var parentSpanID string
+ if p.ParentSpanID != zeroSpanID {
+ parentSpanID = p.ParentSpanID.String()
+ }
+ return json.Marshal(struct {
+ *propagationContext
+ ParentSpanID string `json:"parent_span_id,omitempty"`
+ }{
+ propagationContext: (*propagationContext)(&p),
+ ParentSpanID: parentSpanID,
+ })
+}
+
+func (p PropagationContext) Map() map[string]interface{} {
+ m := map[string]interface{}{
+ "trace_id": p.TraceID,
+ "span_id": p.SpanID,
+ }
+
+ if p.ParentSpanID != zeroSpanID {
+ m["parent_span_id"] = p.ParentSpanID
+ }
+
+ return m
+}
+
+func NewPropagationContext() PropagationContext {
+ p := PropagationContext{}
+
+ if _, err := rand.Read(p.TraceID[:]); err != nil {
+ panic(err)
+ }
+
+ if _, err := rand.Read(p.SpanID[:]); err != nil {
+ panic(err)
+ }
+
+ return p
+}
+
+func PropagationContextFromHeaders(trace, baggage string) (PropagationContext, error) {
+ p := NewPropagationContext()
+
+ if _, err := rand.Read(p.SpanID[:]); err != nil {
+ panic(err)
+ }
+
+ hasTrace := false
+ if trace != "" {
+ if tpc, valid := ParseTraceParentContext([]byte(trace)); valid {
+ hasTrace = true
+ p.TraceID = tpc.TraceID
+ p.ParentSpanID = tpc.ParentSpanID
+ }
+ }
+
+ if baggage != "" {
+ dsc, err := DynamicSamplingContextFromHeader([]byte(baggage))
+ if err != nil {
+ return PropagationContext{}, err
+ }
+ p.DynamicSamplingContext = dsc
+ }
+
+ // In case a sentry-trace header is present but there are no sentry-related
+ // values in the baggage, create an empty, frozen DynamicSamplingContext.
+ if hasTrace && !p.DynamicSamplingContext.HasEntries() {
+ p.DynamicSamplingContext = DynamicSamplingContext{
+ Frozen: true,
+ }
+ }
+
+ return p, nil
+}
diff --git a/vendor/github.com/getsentry/sentry-go/scope.go b/vendor/github.com/getsentry/sentry-go/scope.go
index 374010b67e..48621c94fc 100644
--- a/vendor/github.com/getsentry/sentry-go/scope.go
+++ b/vendor/github.com/getsentry/sentry-go/scope.go
@@ -43,20 +43,22 @@ type Scope struct {
Overflow() bool
}
eventProcessors []EventProcessor
+
+ propagationContext PropagationContext
+ span *Span
}
// NewScope creates a new Scope.
func NewScope() *Scope {
- scope := Scope{
- breadcrumbs: make([]*Breadcrumb, 0),
- attachments: make([]*Attachment, 0),
- tags: make(map[string]string),
- contexts: make(map[string]Context),
- extra: make(map[string]interface{}),
- fingerprint: make([]string, 0),
+ return &Scope{
+ breadcrumbs: make([]*Breadcrumb, 0),
+ attachments: make([]*Attachment, 0),
+ tags: make(map[string]string),
+ contexts: make(map[string]Context),
+ extra: make(map[string]interface{}),
+ fingerprint: make([]string, 0),
+ propagationContext: NewPropagationContext(),
}
-
- return &scope
}
// AddBreadcrumb adds new breadcrumb to the current scope
@@ -292,6 +294,22 @@ func (scope *Scope) SetLevel(level Level) {
scope.level = level
}
+// SetPropagationContext sets the propagation context for the current scope.
+func (scope *Scope) SetPropagationContext(propagationContext PropagationContext) {
+ scope.mu.Lock()
+ defer scope.mu.Unlock()
+
+ scope.propagationContext = propagationContext
+}
+
+// SetSpan sets a span for the current scope.
+func (scope *Scope) SetSpan(span *Span) {
+ scope.mu.Lock()
+ defer scope.mu.Unlock()
+
+ scope.span = span
+}
+
// Clone returns a copy of the current scope with all data copied over.
func (scope *Scope) Clone() *Scope {
scope.mu.RLock()
@@ -318,6 +336,8 @@ func (scope *Scope) Clone() *Scope {
clone.request = scope.request
clone.requestBody = scope.requestBody
clone.eventProcessors = scope.eventProcessors
+ clone.propagationContext = scope.propagationContext
+ clone.span = scope.span
return clone
}
@@ -335,7 +355,7 @@ func (scope *Scope) AddEventProcessor(processor EventProcessor) {
}
// ApplyToEvent takes the data from the current scope and attaches it to the event.
-func (scope *Scope) ApplyToEvent(event *Event, hint *EventHint) *Event {
+func (scope *Scope) ApplyToEvent(event *Event, hint *EventHint, client *Client) *Event {
scope.mu.RLock()
defer scope.mu.RUnlock()
@@ -363,15 +383,6 @@ func (scope *Scope) ApplyToEvent(event *Event, hint *EventHint) *Event {
}
for key, value := range scope.contexts {
- if key == "trace" && event.Type == transactionType {
- // Do not override trace context of
- // transactions, otherwise it breaks the
- // transaction event representation.
- // For error events, the trace context is used
- // to link errors and traces/spans in Sentry.
- continue
- }
-
// Ensure we are not overwriting event fields
if _, ok := event.Contexts[key]; !ok {
event.Contexts[key] = cloneContext(value)
@@ -379,6 +390,27 @@ func (scope *Scope) ApplyToEvent(event *Event, hint *EventHint) *Event {
}
}
+ if event.Contexts == nil {
+ event.Contexts = make(map[string]Context)
+ }
+
+ if scope.span != nil {
+ event.Contexts["trace"] = scope.span.traceContext().Map()
+
+ transaction := scope.span.GetTransaction()
+ if transaction != nil {
+ event.sdkMetaData.dsc = DynamicSamplingContextFromTransaction(transaction)
+ }
+ } else {
+ event.Contexts["trace"] = scope.propagationContext.Map()
+
+ dsc := scope.propagationContext.DynamicSamplingContext
+ if !dsc.HasEntries() && client != nil {
+ dsc = DynamicSamplingContextFromScope(scope, client)
+ }
+ event.sdkMetaData.dsc = dsc
+ }
+
if len(scope.extra) > 0 {
if event.Extra == nil {
event.Extra = make(map[string]interface{}, len(scope.extra))
diff --git a/vendor/github.com/getsentry/sentry-go/sentry.go b/vendor/github.com/getsentry/sentry-go/sentry.go
index c8246de0e1..0fca64e263 100644
--- a/vendor/github.com/getsentry/sentry-go/sentry.go
+++ b/vendor/github.com/getsentry/sentry-go/sentry.go
@@ -6,7 +6,7 @@ import (
)
// The version of the SDK.
-const SDKVersion = "0.28.1"
+const SDKVersion = "0.29.0"
// apiVersion is the minimum version of the Sentry API compatible with the
// sentry-go SDK.
diff --git a/vendor/github.com/getsentry/sentry-go/stacktrace.go b/vendor/github.com/getsentry/sentry-go/stacktrace.go
index 2f8933ea91..3b372bcff1 100644
--- a/vendor/github.com/getsentry/sentry-go/stacktrace.go
+++ b/vendor/github.com/getsentry/sentry-go/stacktrace.go
@@ -307,6 +307,9 @@ func createFrames(frames []runtime.Frame) []Frame {
}
}
+ // Fix issues grouping errors with the new fully qualified function names
+ // introduced from Go 1.21
+ result = cleanupFunctionNamePrefix(result)
return result
}
diff --git a/vendor/github.com/getsentry/sentry-go/stacktrace_below_go1.21.go b/vendor/github.com/getsentry/sentry-go/stacktrace_below_go1.21.go
new file mode 100644
index 0000000000..35a42e4dd0
--- /dev/null
+++ b/vendor/github.com/getsentry/sentry-go/stacktrace_below_go1.21.go
@@ -0,0 +1,7 @@
+//go:build !go1.21
+
+package sentry
+
+func cleanupFunctionNamePrefix(f []Frame) []Frame {
+ return f
+}
diff --git a/vendor/github.com/getsentry/sentry-go/stacktrace_go1.21.go b/vendor/github.com/getsentry/sentry-go/stacktrace_go1.21.go
new file mode 100644
index 0000000000..45147c8505
--- /dev/null
+++ b/vendor/github.com/getsentry/sentry-go/stacktrace_go1.21.go
@@ -0,0 +1,25 @@
+//go:build go1.21
+
+package sentry
+
+import "strings"
+
+// Walk backwards through the results and for the current function name
+// remove it's parent function's prefix, leaving only it's actual name. This
+// fixes issues grouping errors with the new fully qualified function names
+// introduced from Go 1.21.
+
+func cleanupFunctionNamePrefix(f []Frame) []Frame {
+ for i := len(f) - 1; i > 0; i-- {
+ name := f[i].Function
+ parentName := f[i-1].Function + "."
+
+ if !strings.HasPrefix(name, parentName) {
+ continue
+ }
+
+ f[i].Function = name[len(parentName):]
+ }
+
+ return f
+}
diff --git a/vendor/github.com/getsentry/sentry-go/tracing.go b/vendor/github.com/getsentry/sentry-go/tracing.go
index 1bb53d0de9..0f5ade2e84 100644
--- a/vendor/github.com/getsentry/sentry-go/tracing.go
+++ b/vendor/github.com/getsentry/sentry-go/tracing.go
@@ -18,6 +18,20 @@ const (
SentryBaggageHeader = "baggage"
)
+// SpanOrigin indicates what created a trace or a span. See: https://develop.sentry.dev/sdk/performance/trace-origin/
+type SpanOrigin string
+
+const (
+ SpanOriginManual = "manual"
+ SpanOriginEcho = "auto.http.echo"
+ SpanOriginFastHTTP = "auto.http.fasthttp"
+ SpanOriginFiber = "auto.http.fiber"
+ SpanOriginGin = "auto.http.gin"
+ SpanOriginStdLib = "auto.http.stdlib"
+ SpanOriginIris = "auto.http.iris"
+ SpanOriginNegroni = "auto.http.negroni"
+)
+
// A Span is the building block of a Sentry transaction. Spans build up a tree
// structure of timed operations. The span tree makes up a transaction event
// that is sent to Sentry when the root span is finished.
@@ -37,6 +51,7 @@ type Span struct { //nolint: maligned // prefer readability over optimal memory
Data map[string]interface{} `json:"data,omitempty"`
Sampled Sampled `json:"-"`
Source TransactionSource `json:"-"`
+ Origin SpanOrigin `json:"origin,omitempty"`
// mu protects concurrent writes to map fields
mu sync.RWMutex
@@ -113,11 +128,19 @@ func StartSpan(ctx context.Context, operation string, options ...SpanOption) *Sp
parent: parent,
}
+ _, err := rand.Read(span.SpanID[:])
+ if err != nil {
+ panic(err)
+ }
+
if hasParent {
span.TraceID = parent.TraceID
+ span.ParentSpanID = parent.SpanID
+ span.Origin = parent.Origin
} else {
// Only set the Source if this is a transaction
span.Source = SourceCustom
+ span.Origin = SpanOriginManual
// Implementation note:
//
@@ -154,13 +177,6 @@ func StartSpan(ctx context.Context, operation string, options ...SpanOption) *Sp
panic(err)
}
}
- _, err := rand.Read(span.SpanID[:])
- if err != nil {
- panic(err)
- }
- if hasParent {
- span.ParentSpanID = parent.SpanID
- }
// Apply options to override defaults.
for _, option := range options {
@@ -176,11 +192,11 @@ func StartSpan(ctx context.Context, operation string, options ...SpanOption) *Sp
span.recorder.record(&span)
- hub := hubFromContext(ctx)
-
- // Update scope so that all events include a trace context, allowing
- // Sentry to correlate errors to transactions/spans.
- hub.Scope().SetContext("trace", span.traceContext().Map())
+ clientOptions := span.clientOptions()
+ if clientOptions.EnableTracing {
+ hub := hubFromContext(ctx)
+ hub.Scope().SetSpan(&span)
+ }
// Start profiling only if it's a sampled root transaction.
if span.IsTransaction() && span.Sampled.Bool() {
@@ -308,17 +324,21 @@ func (s *Span) ToSentryTrace() string {
// Use this function to propagate the DynamicSamplingContext to a downstream SDK,
// either as the value of the "baggage" HTTP header, or as an html "baggage" meta tag.
func (s *Span) ToBaggage() string {
- if containingTransaction := s.GetTransaction(); containingTransaction != nil {
- // In case there is currently no frozen DynamicSamplingContext attached to the transaction,
- // create one from the properties of the transaction.
- if !s.dynamicSamplingContext.IsFrozen() {
- // This will return a frozen DynamicSamplingContext.
- s.dynamicSamplingContext = DynamicSamplingContextFromTransaction(containingTransaction)
- }
+ t := s.GetTransaction()
+ if t == nil {
+ return ""
+ }
- return containingTransaction.dynamicSamplingContext.String()
+ // In case there is currently no frozen DynamicSamplingContext attached to the transaction,
+ // create one from the properties of the transaction.
+ if !s.dynamicSamplingContext.IsFrozen() {
+ // This will return a frozen DynamicSamplingContext.
+ if dsc := DynamicSamplingContextFromTransaction(t); dsc.HasEntries() {
+ t.dynamicSamplingContext = dsc
+ }
}
- return ""
+
+ return t.dynamicSamplingContext.String()
}
// SetDynamicSamplingContext sets the given dynamic sampling context on the
@@ -534,11 +554,10 @@ func (s *Span) toEvent() *Event {
s.dynamicSamplingContext = DynamicSamplingContextFromTransaction(s)
}
- contexts := map[string]Context{}
+ contexts := make(map[string]Context, len(s.contexts))
for k, v := range s.contexts {
contexts[k] = cloneContext(v)
}
- contexts["trace"] = s.traceContext().Map()
// Make sure that the transaction source is valid
transactionSource := s.Source
@@ -870,6 +889,25 @@ func WithSpanSampled(sampled Sampled) SpanOption {
}
}
+// WithSpanOrigin sets the origin of the span.
+func WithSpanOrigin(origin SpanOrigin) SpanOption {
+ return func(s *Span) {
+ s.Origin = origin
+ }
+}
+
+// Continue a trace based on traceparent and bagge values.
+// If the SDK is configured with tracing enabled,
+// this function returns populated SpanOption.
+// In any other cases, it populates the propagation context on the scope.
+func ContinueTrace(hub *Hub, traceparent, baggage string) SpanOption {
+ scope := hub.Scope()
+ propagationContext, _ := PropagationContextFromHeaders(traceparent, baggage)
+ scope.SetPropagationContext(propagationContext)
+
+ return ContinueFromHeaders(traceparent, baggage)
+}
+
// ContinueFromRequest returns a span option that updates the span to continue
// an existing trace. If it cannot detect an existing trace in the request, the
// span will be left unchanged.
@@ -939,6 +977,7 @@ func SpanFromContext(ctx context.Context) *Span {
func StartTransaction(ctx context.Context, name string, options ...SpanOption) *Span {
currentTransaction, exists := ctx.Value(spanContextKey{}).(*Span)
if exists {
+ currentTransaction.ctx = ctx
return currentTransaction
}
diff --git a/vendor/github.com/getsentry/sentry-go/transport.go b/vendor/github.com/getsentry/sentry-go/transport.go
index 20f69941f5..02fc1d4f18 100644
--- a/vendor/github.com/getsentry/sentry-go/transport.go
+++ b/vendor/github.com/getsentry/sentry-go/transport.go
@@ -357,7 +357,6 @@ func NewHTTPTransport() *HTTPTransport {
transport := HTTPTransport{
BufferSize: defaultBufferSize,
Timeout: defaultTimeout,
- limits: make(ratelimit.Map),
}
return &transport
}
@@ -550,9 +549,14 @@ func (t *HTTPTransport) worker() {
}
Logger.Printf("Sending %s failed with the following error: %s", eventType, string(b))
}
+
t.mu.Lock()
+ if t.limits == nil {
+ t.limits = make(ratelimit.Map)
+ }
t.limits.Merge(ratelimit.FromResponse(response))
t.mu.Unlock()
+
// Drain body up to a limit and close it, allowing the
// transport to reuse TCP connections.
_, _ = io.CopyN(io.Discard, response.Body, maxDrainResponseBytes)
@@ -690,6 +694,10 @@ func (t *HTTPSyncTransport) SendEventWithContext(ctx context.Context, event *Eve
}
t.mu.Lock()
+ if t.limits == nil {
+ t.limits = make(ratelimit.Map)
+ }
+
t.limits.Merge(ratelimit.FromResponse(response))
t.mu.Unlock()
diff --git a/vendor/github.com/go-resty/resty/v2/BUILD.bazel b/vendor/github.com/go-resty/resty/v2/BUILD.bazel
index e41515b771..7248abc506 100644
--- a/vendor/github.com/go-resty/resty/v2/BUILD.bazel
+++ b/vendor/github.com/go-resty/resty/v2/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
load("@bazel_gazelle//:def.bzl", "gazelle")
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
# gazelle:prefix github.com/go-resty/resty/v2
# gazelle:go_naming_convention import_alias
@@ -17,17 +17,19 @@ go_library(
"resty.go",
"retry.go",
"trace.go",
- "transport_js.go",
- "transport_other.go",
"transport.go",
"transport112.go",
+ "transport_js.go",
+ "transport_other.go",
"util.go",
"util_curl.go",
- "shellescape/shellescape.go"
],
importpath = "github.com/go-resty/resty/v2",
visibility = ["//visibility:public"],
- deps = ["@org_golang_x_net//publicsuffix:go_default_library"],
+ deps = [
+ "//shellescape",
+ "@org_golang_x_net//publicsuffix:go_default_library",
+ ],
)
go_test(
@@ -36,6 +38,7 @@ go_test(
"client_test.go",
"context_test.go",
"example_test.go",
+ "middleware_test.go",
"request_test.go",
"resty_test.go",
"retry_test.go",
@@ -43,7 +46,10 @@ go_test(
],
data = glob([".testdata/*"]),
embed = [":resty"],
- deps = ["@org_golang_x_net//proxy:go_default_library"],
+ deps = [
+ "@org_golang_x_net//proxy:go_default_library",
+ "@org_golang_x_time//rate:go_default_library",
+ ],
)
alias(
diff --git a/vendor/github.com/go-resty/resty/v2/README.md b/vendor/github.com/go-resty/resty/v2/README.md
index 2d3542b5aa..c02ae0c458 100644
--- a/vendor/github.com/go-resty/resty/v2/README.md
+++ b/vendor/github.com/go-resty/resty/v2/README.md
@@ -4,16 +4,12 @@
Features section describes in detail about Resty capabilities
-
-
-
-
Resty Communication Channels
-
+
## News
- * v2.14.0 [released](https://github.com/go-resty/resty/releases/tag/v2.14.0) and tagged on Aug 04, 2024.
+ * v2.15.1 [released](https://github.com/go-resty/resty/releases/tag/v2.15.1) and tagged on Sep 18, 2024.
* v2.0.0 [released](https://github.com/go-resty/resty/releases/tag/v2.0.0) and tagged on Jul 16, 2019.
* v1.12.0 [released](https://github.com/go-resty/resty/releases/tag/v1.12.0) and tagged on Feb 27, 2019.
* v1.0 released and tagged on Sep 25, 2017. - Resty's first version was released on Sep 15, 2015 then it grew gradually as a very handy and helpful library. Its been a two years since first release. I'm very thankful to Resty users and its [contributors](https://github.com/go-resty/resty/graphs/contributors).
@@ -62,9 +58,10 @@
* goroutine concurrent safe
* Resty Client trace, see [Client.EnableTrace](https://pkg.go.dev/github.com/go-resty/resty/v2#Client.EnableTrace) and [Request.EnableTrace](https://pkg.go.dev/github.com/go-resty/resty/v2#Request.EnableTrace)
* Since v2.4.0, trace info contains a `RequestAttempt` value, and the `Request` object contains an `Attempt` attribute
+ * Supports on-demand CURL command generation, see [Client.EnableGenerateCurlOnDebug](https://pkg.go.dev/github.com/go-resty/resty/v2#Client.EnableGenerateCurlOnDebug), [Request.EnableGenerateCurlOnDebug](https://pkg.go.dev/github.com/go-resty/resty/v2#Request.EnableGenerateCurlOnDebug). It requires debug mode to be enabled.
* Debug mode - clean and informative logging presentation
* Gzip - Go does it automatically also resty has fallback handling too
- * Works fine with `HTTP/2` and `HTTP/1.1`
+ * Works fine with `HTTP/2` and `HTTP/1.1`, also `HTTP/3` can be used with Resty, see this [comment](https://github.com/go-resty/resty/issues/846#issuecomment-2329696110)
* [Bazel support](#bazel-support)
* Easily mock Resty for testing, [for e.g.](#mocking-http-requests-using-httpmock-library)
* Well tested client library
@@ -86,7 +83,7 @@
#### Supported Go Versions
-Recommended to use `go1.16` and above.
+Recommended to use `go1.20` and above.
Initially Resty started supporting `go modules` since `v1.10.0` release.
@@ -101,8 +98,6 @@ Starting Resty v2 and higher versions, it fully embraces [go modules](https://gi
Resty author also published following projects for Go Community.
- * [aah framework](https://aahframework.org) - A secure, flexible, rapid Go web framework.
- * [THUMBAI](https://thumbai.app) - Go Mod Repository, Go Vanity Service and Simple Proxy Server.
* [go-model](https://github.com/jeevatkm/go-model) - Robust & Easy to use model mapper and utility methods for Go `struct`.
@@ -110,7 +105,7 @@ Resty author also published following projects for Go Community.
```bash
# Go Modules
-require github.com/go-resty/resty/v2 v2.11.0
+require github.com/go-resty/resty/v2 v2.15.1
```
## Usage
@@ -131,11 +126,6 @@ client := resty.New()
resp, err := client.R().
EnableTrace().
Get("https://httpbin.org/get")
-curlCmdExecuted := resp.Request.GenerateCurlCommand()
-
-
-// Explore curl command
-fmt.Println("Curl Command:\n ", curlCmdExecuted+"\n")
// Explore response object
fmt.Println("Response Info:")
@@ -165,9 +155,6 @@ fmt.Println(" RequestAttempt:", ti.RequestAttempt)
fmt.Println(" RemoteAddr :", ti.RemoteAddr.String())
/* Output
-Curl Command:
- curl -X GET -H 'User-Agent: go-resty/2.12.0 (https://github.com/go-resty/resty)' https://httpbin.org/get
-
Response Info:
Error :
Status Code: 200
@@ -566,6 +553,30 @@ client.OnError(func(req *resty.Request, err error) {
})
```
+#### Generate CURL Command
+>Refer: [curl_cmd_test.go](https://github.com/go-resty/resty/blob/v2/curl_cmd_test.go)
+
+```go
+// Create a Resty Client
+client := resty.New()
+
+resp, err := client.R().
+ SetDebug(true).
+ EnableGenerateCurlOnDebug(). // CURL command generated when debug mode enabled with this option
+ SetBody(map[string]string{"name": "Alex"}).
+ Post("https://httpbin.org/post")
+
+curlCmdExecuted := resp.Request.GenerateCurlCommand()
+
+// Explore curl command
+fmt.Println("Curl Command:\n ", curlCmdExecuted+"\n")
+
+/* Output
+Curl Command:
+ curl -X POST -H 'Content-Type: application/json' -H 'User-Agent: go-resty/2.14.0 (https://github.com/go-resty/resty)' -d '{"name":"Alex"}' https://httpbin.org/post
+*/
+```
+
#### Redirect Policy
Resty provides few ready to use redirect policy(s) also it supports multiple policies together.
diff --git a/vendor/github.com/go-resty/resty/v2/WORKSPACE b/vendor/github.com/go-resty/resty/v2/WORKSPACE
index 9ef03e95a4..504de14582 100644
--- a/vendor/github.com/go-resty/resty/v2/WORKSPACE
+++ b/vendor/github.com/go-resty/resty/v2/WORKSPACE
@@ -4,10 +4,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "io_bazel_rules_go",
- sha256 = "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b",
+ sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
- "https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
+ "https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
],
)
@@ -24,7 +24,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
go_rules_dependencies()
-go_register_toolchains(version = "1.16")
+go_register_toolchains(version = "1.19")
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
diff --git a/vendor/github.com/go-resty/resty/v2/client.go b/vendor/github.com/go-resty/resty/v2/client.go
index aeb550778f..a40bbe4bd4 100644
--- a/vendor/github.com/go-resty/resty/v2/client.go
+++ b/vendor/github.com/go-resty/resty/v2/client.go
@@ -92,11 +92,11 @@ type (
SuccessHook func(*Client, *Response)
)
-// Client struct is used to create Resty client with client level settings,
-// these settings are applicable to all the request raised from the client.
+// Client struct is used to create a Resty client with client-level settings,
+// these settings apply to all the requests raised from the client.
//
-// Resty also provides an options to override most of the client settings
-// at request level.
+// Resty also provides an option to override most of the client settings
+// at [Request] level.
type Client struct {
BaseURL string
HostURL string // Deprecated: use BaseURL instead. To be removed in v3.0.0 release.
@@ -128,6 +128,7 @@ type Client struct {
// HeaderAuthorizationKey is used to set/access Request Authorization header
// value when `SetAuthToken` option is used.
HeaderAuthorizationKey string
+ ResponseBodyLimit int
jsonEscapeHTML bool
setContentLength bool
@@ -153,6 +154,7 @@ type Client struct {
invalidHooks []ErrorHook
panicHooks []ErrorHook
rateLimiter RateLimiter
+ generateCurlOnDebug bool
}
// User type is to hold an username and password information
@@ -164,8 +166,8 @@ type User struct {
// Client methods
//___________________________________
-// SetHostURL method is to set Host URL in the client instance. It will be used with request
-// raised from this client with relative URL
+// SetHostURL method sets the Host URL in the client instance. It will be used with a request
+// raised from this client with a relative URL
//
// // Setting HTTP address
// client.SetHostURL("http://myjeeva.com")
@@ -173,22 +175,20 @@ type User struct {
// // Setting HTTPS address
// client.SetHostURL("https://myjeeva.com")
//
-// Deprecated: use SetBaseURL instead. To be removed in v3.0.0 release.
+// Deprecated: use [Client.SetBaseURL] instead. To be removed in the v3.0.0 release.
func (c *Client) SetHostURL(url string) *Client {
c.SetBaseURL(url)
return c
}
-// SetBaseURL method is to set Base URL in the client instance. It will be used with request
-// raised from this client with relative URL
+// SetBaseURL method sets the Base URL in the client instance. It will be used with a request
+// raised from this client with a relative URL
//
// // Setting HTTP address
// client.SetBaseURL("http://myjeeva.com")
//
// // Setting HTTPS address
// client.SetBaseURL("https://myjeeva.com")
-//
-// Since v2.7.0
func (c *Client) SetBaseURL(url string) *Client {
c.BaseURL = strings.TrimRight(url, "/")
c.HostURL = c.BaseURL
@@ -196,10 +196,10 @@ func (c *Client) SetBaseURL(url string) *Client {
}
// SetHeader method sets a single header field and its value in the client instance.
-// These headers will be applied to all requests raised from this client instance.
-// Also it can be overridden at request level header options.
+// These headers will be applied to all requests from this client instance.
+// Also, it can be overridden by request-level header options.
//
-// See `Request.SetHeader` or `Request.SetHeaders`.
+// See [Request.SetHeader] or [Request.SetHeaders].
//
// For Example: To set `Content-Type` and `Accept` as `application/json`
//
@@ -211,11 +211,11 @@ func (c *Client) SetHeader(header, value string) *Client {
return c
}
-// SetHeaders method sets multiple headers field and its values at one go in the client instance.
-// These headers will be applied to all requests raised from this client instance. Also it can be
+// SetHeaders method sets multiple header fields and their values at one go in the client instance.
+// These headers will be applied to all requests from this client instance. Also, it can be
// overridden at request level headers options.
//
-// See `Request.SetHeaders` or `Request.SetHeader`.
+// See [Request.SetHeaders] or [Request.SetHeader].
//
// For Example: To set `Content-Type` and `Accept` as `application/json`
//
@@ -230,25 +230,21 @@ func (c *Client) SetHeaders(headers map[string]string) *Client {
return c
}
-// SetHeaderVerbatim method is to set a single header field and its value verbatim in the current request.
+// SetHeaderVerbatim method sets a single header field and its value verbatim in the current request.
//
// For Example: To set `all_lowercase` and `UPPERCASE` as `available`.
//
-// client.R().
+// client.
// SetHeaderVerbatim("all_lowercase", "available").
// SetHeaderVerbatim("UPPERCASE", "available")
-//
-// Also you can override header value, which was set at client instance level.
-//
-// Since v2.6.0
func (c *Client) SetHeaderVerbatim(header, value string) *Client {
c.Header[header] = []string{value}
return c
}
-// SetCookieJar method sets custom http.CookieJar in the resty client. Its way to override default.
+// SetCookieJar method sets custom [http.CookieJar] in the resty client. It's a way to override the default.
//
-// For Example: sometimes we don't want to save cookies in api contacting, we can remove the default
+// For Example, sometimes we don't want to save cookies in API mode so that we can remove the default
// CookieJar in resty client.
//
// client.SetCookieJar(nil)
@@ -257,8 +253,8 @@ func (c *Client) SetCookieJar(jar http.CookieJar) *Client {
return c
}
-// SetCookie method appends a single cookie in the client instance.
-// These cookies will be added to all the request raised from this client instance.
+// SetCookie method appends a single cookie to the client instance.
+// These cookies will be added to all the requests from this client instance.
//
// client.SetCookie(&http.Cookie{
// Name:"go-resty",
@@ -270,7 +266,7 @@ func (c *Client) SetCookie(hc *http.Cookie) *Client {
}
// SetCookies method sets an array of cookies in the client instance.
-// These cookies will be added to all the request raised from this client instance.
+// These cookies will be added to all the requests from this client instance.
//
// cookies := []*http.Cookie{
// &http.Cookie{
@@ -290,14 +286,15 @@ func (c *Client) SetCookies(cs []*http.Cookie) *Client {
return c
}
-// SetQueryParam method sets single parameter and its value in the client instance.
-// It will be formed as query string for the request.
+// SetQueryParam method sets a single parameter and its value in the client instance.
+// It will be formed as a query string for the request.
+//
+// For Example: `search=kitchen%20papers&size=large`
//
-// For Example: `search=kitchen%20papers&size=large`
-// in the URL after `?` mark. These query params will be added to all the request raised from
-// this client instance. Also it can be overridden at request level Query Param options.
+// In the URL after the `?` mark. These query params will be added to all the requests raised from
+// this client instance. Also, it can be overridden at the request level.
//
-// See `Request.SetQueryParam` or `Request.SetQueryParams`.
+// See [Request.SetQueryParam] or [Request.SetQueryParams].
//
// client.
// SetQueryParam("search", "kitchen papers").
@@ -308,13 +305,14 @@ func (c *Client) SetQueryParam(param, value string) *Client {
}
// SetQueryParams method sets multiple parameters and their values at one go in the client instance.
-// It will be formed as query string for the request.
+// It will be formed as a query string for the request.
+//
+// For Example: `search=kitchen%20papers&size=large`
//
-// For Example: `search=kitchen%20papers&size=large`
-// in the URL after `?` mark. These query params will be added to all the request raised from this
-// client instance. Also it can be overridden at request level Query Param options.
+// In the URL after the `?` mark. These query params will be added to all the requests raised from this
+// client instance. Also, it can be overridden at the request level.
//
-// See `Request.SetQueryParams` or `Request.SetQueryParam`.
+// See [Request.SetQueryParams] or [Request.SetQueryParam].
//
// client.SetQueryParams(map[string]string{
// "search": "kitchen papers",
@@ -328,11 +326,11 @@ func (c *Client) SetQueryParams(params map[string]string) *Client {
}
// SetFormData method sets Form parameters and their values in the client instance.
-// It's applicable only HTTP method `POST` and `PUT` and request content type would be set as
-// `application/x-www-form-urlencoded`. These form data will be added to all the request raised from
-// this client instance. Also it can be overridden at request level form data.
+// It applies only to HTTP methods `POST` and `PUT`, and the request content type would be set as
+// `application/x-www-form-urlencoded`. These form data will be added to all the requests raised from
+// this client instance. Also, it can be overridden at the request level.
//
-// See `Request.SetFormData`.
+// See [Request.SetFormData].
//
// client.SetFormData(map[string]string{
// "access_token": "BC594900-518B-4F7E-AC75-BD37F019E08F",
@@ -353,17 +351,17 @@ func (c *Client) SetFormData(data map[string]string) *Client {
//
// client.SetBasicAuth("go-resty", "welcome")
//
-// This basic auth information gets added to all the request raised from this client instance.
-// Also it can be overridden or set one at the request level is supported.
+// This basic auth information is added to all requests from this client instance.
+// It can also be overridden at the request level.
//
-// See `Request.SetBasicAuth`.
+// See [Request.SetBasicAuth].
func (c *Client) SetBasicAuth(username, password string) *Client {
c.UserInfo = &User{Username: username, Password: password}
return c
}
// SetAuthToken method sets the auth token of the `Authorization` header for all HTTP requests.
-// The default auth scheme is `Bearer`, it can be customized with the method `SetAuthScheme`. For Example:
+// The default auth scheme is `Bearer`; it can be customized with the method [Client.SetAuthScheme]. For Example:
//
// Authorization:
//
@@ -372,9 +370,9 @@ func (c *Client) SetBasicAuth(username, password string) *Client {
// client.SetAuthToken("BC594900518B4F7EAC75BD37F019E08FBC594900518B4F7EAC75BD37F019E08F")
//
// This auth token gets added to all the requests raised from this client instance.
-// Also it can be overridden or set one at the request level is supported.
+// Also, it can be overridden at the request level.
//
-// See `Request.SetAuthToken`.
+// See [Request.SetAuthToken].
func (c *Client) SetAuthToken(token string) *Client {
c.Token = token
return c
@@ -389,15 +387,14 @@ func (c *Client) SetAuthToken(token string) *Client {
// client.SetAuthScheme("OAuth")
//
// This auth scheme gets added to all the requests raised from this client instance.
-// Also it can be overridden or set one at the request level is supported.
+// Also, it can be overridden at the request level.
//
-// Information about auth schemes can be found in RFC7235 which is linked to below
-// along with the page containing the currently defined official authentication schemes:
+// Information about auth schemes can be found in [RFC 7235], IANA [HTTP Auth schemes].
//
-// https://tools.ietf.org/html/rfc7235
-// https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml#authschemes
+// See [Request.SetAuthToken].
//
-// See `Request.SetAuthToken`.
+// [RFC 7235]: https://tools.ietf.org/html/rfc7235
+// [HTTP Auth schemes]: https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml#authschemes
func (c *Client) SetAuthScheme(scheme string) *Client {
c.AuthScheme = scheme
return c
@@ -410,11 +407,11 @@ func (c *Client) SetAuthScheme(scheme string) *Client {
//
// client.SetDigestAuth("Mufasa", "Circle Of Life")
//
-// Information about Digest Access Authentication can be found in RFC7616:
+// Information about Digest Access Authentication can be found in [RFC 7616].
//
-// https://datatracker.ietf.org/doc/html/rfc7616
+// See [Request.SetDigestAuth].
//
-// See `Request.SetDigestAuth`.
+// [RFC 7616]: https://datatracker.ietf.org/doc/html/rfc7616
func (c *Client) SetDigestAuth(username, password string) *Client {
oldTransport := c.httpClient.Transport
c.OnBeforeRequest(func(c *Client, _ *Request) error {
@@ -431,7 +428,7 @@ func (c *Client) SetDigestAuth(username, password string) *Client {
return c
}
-// R method creates a new request instance, its used for Get, Post, Put, Delete, Patch, Head, Options, etc.
+// R method creates a new request instance; it's used for Get, Post, Put, Delete, Patch, Head, Options, etc.
func (c *Client) R() *Request {
r := &Request{
QueryParam: url.Values{},
@@ -442,30 +439,31 @@ func (c *Client) R() *Request {
RawPathParams: map[string]string{},
Debug: c.Debug,
- client: c,
- multipartFiles: []*File{},
- multipartFields: []*MultipartField{},
- jsonEscapeHTML: c.jsonEscapeHTML,
- log: c.log,
+ client: c,
+ multipartFiles: []*File{},
+ multipartFields: []*MultipartField{},
+ jsonEscapeHTML: c.jsonEscapeHTML,
+ log: c.log,
+ responseBodyLimit: c.ResponseBodyLimit,
+ generateCurlOnDebug: c.generateCurlOnDebug,
}
return r
}
-// NewRequest is an alias for method `R()`. Creates a new request instance, its used for
-// Get, Post, Put, Delete, Patch, Head, Options, etc.
+// NewRequest method is an alias for method `R()`.
func (c *Client) NewRequest() *Request {
return c.R()
}
-// OnBeforeRequest method appends a request middleware into the before request chain.
-// The user defined middlewares get applied before the default Resty request middlewares.
+// OnBeforeRequest method appends a request middleware to the before request chain.
+// The user-defined middlewares are applied before the default Resty request middlewares.
// After all middlewares have been applied, the request is sent from Resty to the host server.
//
// client.OnBeforeRequest(func(c *resty.Client, r *resty.Request) error {
-// // Now you have access to Client and Request instance
+// // Now you have access to the Client and Request instance
// // manipulate it as per your need
//
-// return nil // if its success otherwise return error
+// return nil // if its successful otherwise return error
// })
func (c *Client) OnBeforeRequest(m RequestMiddleware) *Client {
c.udBeforeRequestLock.Lock()
@@ -476,15 +474,15 @@ func (c *Client) OnBeforeRequest(m RequestMiddleware) *Client {
return c
}
-// OnAfterResponse method appends response middleware into the after response chain.
-// Once we receive response from host server, default Resty response middleware
-// gets applied and then user assigned response middlewares applied.
+// OnAfterResponse method appends response middleware to the after-response chain.
+// Once we receive a response from the host server, the default Resty response middleware
+// gets applied, and then the user-assigned response middleware is applied.
//
// client.OnAfterResponse(func(c *resty.Client, r *resty.Response) error {
-// // Now you have access to Client and Response instance
+// // Now you have access to the Client and Response instance
// // manipulate it as per your need
//
-// return nil // if its success otherwise return error
+// return nil // if its successful otherwise return error
// })
func (c *Client) OnAfterResponse(m ResponseMiddleware) *Client {
c.afterResponseLock.Lock()
@@ -497,7 +495,7 @@ func (c *Client) OnAfterResponse(m ResponseMiddleware) *Client {
// OnError method adds a callback that will be run whenever a request execution fails.
// This is called after all retries have been attempted (if any).
-// If there was a response from the server, the error will be wrapped in *ResponseError
+// If there was a response from the server, the error will be wrapped in [ResponseError]
// which has the last response received from the server.
//
// client.OnError(func(req *resty.Request, err error) {
@@ -507,8 +505,8 @@ func (c *Client) OnAfterResponse(m ResponseMiddleware) *Client {
// // Log the error, increment a metric, etc...
// })
//
-// Out of the OnSuccess, OnError, OnInvalid, OnPanic callbacks, exactly one
-// set will be invoked for each call to Request.Execute() that completes.
+// Out of the [Client.OnSuccess], [Client.OnError], [Client.OnInvalid], [Client.OnPanic]
+// callbacks, exactly one set will be invoked for each call to [Request.Execute] that completes.
func (c *Client) OnError(h ErrorHook) *Client {
c.errorHooks = append(c.errorHooks, h)
return c
@@ -517,10 +515,8 @@ func (c *Client) OnError(h ErrorHook) *Client {
// OnSuccess method adds a callback that will be run whenever a request execution
// succeeds. This is called after all retries have been attempted (if any).
//
-// Out of the OnSuccess, OnError, OnInvalid, OnPanic callbacks, exactly one
-// set will be invoked for each call to Request.Execute() that completes.
-//
-// Since v2.8.0
+// Out of the [Client.OnSuccess], [Client.OnError], [Client.OnInvalid], [Client.OnPanic]
+// callbacks, exactly one set will be invoked for each call to [Request.Execute] that completes.
func (c *Client) OnSuccess(h SuccessHook) *Client {
c.successHooks = append(c.successHooks, h)
return c
@@ -529,10 +525,8 @@ func (c *Client) OnSuccess(h SuccessHook) *Client {
// OnInvalid method adds a callback that will be run whenever a request execution
// fails before it starts because the request is invalid.
//
-// Out of the OnSuccess, OnError, OnInvalid, OnPanic callbacks, exactly one
-// set will be invoked for each call to Request.Execute() that completes.
-//
-// Since v2.8.0
+// Out of the [Client.OnSuccess], [Client.OnError], [Client.OnInvalid], [Client.OnPanic]
+// callbacks, exactly one set will be invoked for each call to [Request.Execute] that completes.
func (c *Client) OnInvalid(h ErrorHook) *Client {
c.invalidHooks = append(c.invalidHooks, h)
return c
@@ -541,21 +535,20 @@ func (c *Client) OnInvalid(h ErrorHook) *Client {
// OnPanic method adds a callback that will be run whenever a request execution
// panics.
//
-// Out of the OnSuccess, OnError, OnInvalid, OnPanic callbacks, exactly one
-// set will be invoked for each call to Request.Execute() that completes.
-// If an OnSuccess, OnError, or OnInvalid callback panics, then the exactly
-// one rule can be violated.
+// Out of the [Client.OnSuccess], [Client.OnError], [Client.OnInvalid], [Client.OnPanic]
+// callbacks, exactly one set will be invoked for each call to [Request.Execute] that completes.
//
-// Since v2.8.0
+// If an [Client.OnSuccess], [Client.OnError], or [Client.OnInvalid] callback panics,
+// then exactly one rule can be violated.
func (c *Client) OnPanic(h ErrorHook) *Client {
c.panicHooks = append(c.panicHooks, h)
return c
}
-// SetPreRequestHook method sets the given pre-request function into resty client.
+// SetPreRequestHook method sets the given pre-request function into a resty client.
// It is called right before the request is fired.
//
-// Note: Only one pre-request hook can be registered. Use `client.OnBeforeRequest` for multiple.
+// NOTE: Only one pre-request hook can be registered. Use [Client.OnBeforeRequest] for multiple.
func (c *Client) SetPreRequestHook(h PreRequestHook) *Client {
if c.preReqHook != nil {
c.log.Warnf("Overwriting an existing pre-request hook: %s", functionName(h))
@@ -564,19 +557,23 @@ func (c *Client) SetPreRequestHook(h PreRequestHook) *Client {
return c
}
-// SetDebug method enables the debug mode on Resty client. Client logs details of every request and response.
-// For `Request` it logs information such as HTTP verb, Relative URL path, Host, Headers, Body if it has one.
-// For `Response` it logs information such as Status, Response Time, Headers, Body if it has one.
+// SetDebug method enables the debug mode on the Resty client. The client logs details
+// of every request and response.
//
// client.SetDebug(true)
//
-// Also it can be enabled at request level for particular request, see `Request.SetDebug`.
+// Also, it can be enabled at the request level for a particular request; see [Request.SetDebug].
+// - For [Request], it logs information such as HTTP verb, Relative URL path,
+// Host, Headers, and Body if it has one.
+// - For [Response], it logs information such as Status, Response Time, Headers,
+// and Body if it has one.
func (c *Client) SetDebug(d bool) *Client {
c.Debug = d
return c
}
-// SetDebugBodyLimit sets the maximum size for which the response and request body will be logged in debug mode.
+// SetDebugBodyLimit sets the maximum size in bytes for which the response and
+// request body will be logged in debug mode.
//
// client.SetDebugBodyLimit(1000000)
func (c *Client) SetDebugBodyLimit(sl int64) *Client {
@@ -584,8 +581,8 @@ func (c *Client) SetDebugBodyLimit(sl int64) *Client {
return c
}
-// OnRequestLog method used to set request log callback into Resty. Registered callback gets
-// called before the resty actually logs the information.
+// OnRequestLog method sets the request log callback to Resty. Registered callback gets
+// called before the resty logs the information.
func (c *Client) OnRequestLog(rl RequestLogCallback) *Client {
if c.requestLog != nil {
c.log.Warnf("Overwriting an existing on-request-log callback from=%s to=%s",
@@ -595,8 +592,8 @@ func (c *Client) OnRequestLog(rl RequestLogCallback) *Client {
return c
}
-// OnResponseLog method used to set response log callback into Resty. Registered callback gets
-// called before the resty actually logs the information.
+// OnResponseLog method sets the response log callback to Resty. Registered callback gets
+// called before the resty logs the information.
func (c *Client) OnResponseLog(rl ResponseLogCallback) *Client {
if c.responseLog != nil {
c.log.Warnf("Overwriting an existing on-response-log callback from=%s to=%s",
@@ -606,9 +603,9 @@ func (c *Client) OnResponseLog(rl ResponseLogCallback) *Client {
return c
}
-// SetDisableWarn method disables the warning message on Resty client.
+// SetDisableWarn method disables the warning log message on the Resty client.
//
-// For Example: Resty warns the user when BasicAuth used on non-TLS mode.
+// For example, Resty warns users when BasicAuth is used in non-TLS mode.
//
// client.SetDisableWarn(true)
func (c *Client) SetDisableWarn(d bool) *Client {
@@ -616,9 +613,9 @@ func (c *Client) SetDisableWarn(d bool) *Client {
return c
}
-// SetAllowGetMethodPayload method allows the GET method with payload on Resty client.
+// SetAllowGetMethodPayload method allows the GET method with payload on the Resty client.
//
-// For Example: Resty allows the user sends request with a payload on HTTP GET method.
+// For example, Resty allows the user to send a request with a payload using the HTTP GET method.
//
// client.SetAllowGetMethodPayload(true)
func (c *Client) SetAllowGetMethodPayload(a bool) *Client {
@@ -628,24 +625,24 @@ func (c *Client) SetAllowGetMethodPayload(a bool) *Client {
// SetLogger method sets given writer for logging Resty request and response details.
//
-// Compliant to interface `resty.Logger`.
+// Compliant to interface [resty.Logger]
func (c *Client) SetLogger(l Logger) *Client {
c.log = l
return c
}
// SetContentLength method enables the HTTP header `Content-Length` value for every request.
-// By default Resty won't set `Content-Length`.
+// By default, Resty won't set `Content-Length`.
//
// client.SetContentLength(true)
//
-// Also you have an option to enable for particular request. See `Request.SetContentLength`
+// Also, you have the option to enable a particular request. See [Request.SetContentLength]
func (c *Client) SetContentLength(l bool) *Client {
c.setContentLength = l
return c
}
-// SetTimeout method sets timeout for request raised from client.
+// SetTimeout method sets the timeout for a request raised by the client.
//
// client.SetTimeout(time.Duration(1 * time.Minute))
func (c *Client) SetTimeout(timeout time.Duration) *Client {
@@ -653,9 +650,9 @@ func (c *Client) SetTimeout(timeout time.Duration) *Client {
return c
}
-// SetError method is to register the global or client common `Error` object into Resty.
-// It is used for automatic unmarshalling if response status code is greater than 399 and
-// content type either JSON or XML. Can be pointer or non-pointer.
+// SetError method registers the global or client common `Error` object into Resty.
+// It is used for automatic unmarshalling if the response status code is greater than 399 and
+// content type is JSON or XML. It can be a pointer or a non-pointer.
//
// client.SetError(&Error{})
// // OR
@@ -665,8 +662,8 @@ func (c *Client) SetError(err interface{}) *Client {
return c
}
-// SetRedirectPolicy method sets the client redirect policy. Resty provides ready to use
-// redirect policies. Wanna create one for yourself refer to `redirect.go`.
+// SetRedirectPolicy method sets the redirect policy for the client. Resty provides ready-to-use
+// redirect policies. Wanna create one for yourself, refer to `redirect.go`.
//
// client.SetRedirectPolicy(FlexibleRedirectPolicy(20))
//
@@ -699,7 +696,7 @@ func (c *Client) SetRetryCount(count int) *Client {
return c
}
-// SetRetryWaitTime method sets default wait time to sleep before retrying
+// SetRetryWaitTime method sets the default wait time for sleep before retrying
// request.
//
// Default is 100 milliseconds.
@@ -708,7 +705,7 @@ func (c *Client) SetRetryWaitTime(waitTime time.Duration) *Client {
return c
}
-// SetRetryMaxWaitTime method sets max wait time to sleep before retrying
+// SetRetryMaxWaitTime method sets the max wait time for sleep before retrying
// request.
//
// Default is 2 seconds.
@@ -717,7 +714,7 @@ func (c *Client) SetRetryMaxWaitTime(maxWaitTime time.Duration) *Client {
return c
}
-// SetRetryAfter sets callback to calculate wait time between retries.
+// SetRetryAfter sets a callback to calculate the wait time between retries.
// Default (nil) implies exponential backoff with jitter
func (c *Client) SetRetryAfter(callback RetryAfterFunc) *Client {
c.RetryAfter = callback
@@ -725,56 +722,46 @@ func (c *Client) SetRetryAfter(callback RetryAfterFunc) *Client {
}
// SetJSONMarshaler method sets the JSON marshaler function to marshal the request body.
-// By default, Resty uses `encoding/json` package to marshal the request body.
-//
-// Since v2.8.0
+// By default, Resty uses [encoding/json] package to marshal the request body.
func (c *Client) SetJSONMarshaler(marshaler func(v interface{}) ([]byte, error)) *Client {
c.JSONMarshal = marshaler
return c
}
// SetJSONUnmarshaler method sets the JSON unmarshaler function to unmarshal the response body.
-// By default, Resty uses `encoding/json` package to unmarshal the response body.
-//
-// Since v2.8.0
+// By default, Resty uses [encoding/json] package to unmarshal the response body.
func (c *Client) SetJSONUnmarshaler(unmarshaler func(data []byte, v interface{}) error) *Client {
c.JSONUnmarshal = unmarshaler
return c
}
// SetXMLMarshaler method sets the XML marshaler function to marshal the request body.
-// By default, Resty uses `encoding/xml` package to marshal the request body.
-//
-// Since v2.8.0
+// By default, Resty uses [encoding/xml] package to marshal the request body.
func (c *Client) SetXMLMarshaler(marshaler func(v interface{}) ([]byte, error)) *Client {
c.XMLMarshal = marshaler
return c
}
// SetXMLUnmarshaler method sets the XML unmarshaler function to unmarshal the response body.
-// By default, Resty uses `encoding/xml` package to unmarshal the response body.
-//
-// Since v2.8.0
+// By default, Resty uses [encoding/xml] package to unmarshal the response body.
func (c *Client) SetXMLUnmarshaler(unmarshaler func(data []byte, v interface{}) error) *Client {
c.XMLUnmarshal = unmarshaler
return c
}
-// AddRetryCondition method adds a retry condition function to array of functions
+// AddRetryCondition method adds a retry condition function to an array of functions
// that are checked to determine if the request is retried. The request will
-// retry if any of the functions return true and error is nil.
+// retry if any functions return true and the error is nil.
//
-// Note: These retry conditions are applied on all Request made using this Client.
-// For Request specific retry conditions check *Request.AddRetryCondition
+// NOTE: These retry conditions are applied on all requests made using this Client.
+// For [Request] specific retry conditions, check [Request.AddRetryCondition]
func (c *Client) AddRetryCondition(condition RetryConditionFunc) *Client {
c.RetryConditions = append(c.RetryConditions, condition)
return c
}
// AddRetryAfterErrorCondition adds the basic condition of retrying after encountering
-// an error from the http response
-//
-// Since v2.6.0
+// an error from the HTTP response
func (c *Client) AddRetryAfterErrorCondition() *Client {
c.AddRetryCondition(func(response *Response, err error) bool {
return response.IsError()
@@ -784,33 +771,29 @@ func (c *Client) AddRetryAfterErrorCondition() *Client {
// AddRetryHook adds a side-effecting retry hook to an array of hooks
// that will be executed on each retry.
-//
-// Since v2.6.0
func (c *Client) AddRetryHook(hook OnRetryFunc) *Client {
c.RetryHooks = append(c.RetryHooks, hook)
return c
}
// SetRetryResetReaders method enables the Resty client to seek the start of all
-// file readers given as multipart files, if the given object implements `io.ReadSeeker`.
-//
-// Since ...
+// file readers are given as multipart files if the object implements [io.ReadSeeker].
func (c *Client) SetRetryResetReaders(b bool) *Client {
c.RetryResetReaders = b
return c
}
-// SetTLSClientConfig method sets TLSClientConfig for underling client Transport.
+// SetTLSClientConfig method sets TLSClientConfig for underlying client Transport.
//
// For Example:
//
-// // One can set custom root-certificate. Refer: http://golang.org/pkg/crypto/tls/#example_Dial
+// // One can set a custom root certificate. Refer: http://golang.org/pkg/crypto/tls/#example_Dial
// client.SetTLSClientConfig(&tls.Config{ RootCAs: roots })
//
// // or One can disable security check (https)
// client.SetTLSClientConfig(&tls.Config{ InsecureSkipVerify: true })
//
-// Note: This method overwrites existing `TLSClientConfig`.
+// NOTE: This method overwrites existing [http.Transport.TLSClientConfig]
func (c *Client) SetTLSClientConfig(config *tls.Config) *Client {
transport, err := c.Transport()
if err != nil {
@@ -821,13 +804,11 @@ func (c *Client) SetTLSClientConfig(config *tls.Config) *Client {
return c
}
-// SetProxy method sets the Proxy URL and Port for Resty client.
+// SetProxy method sets the Proxy URL and Port for the Resty client.
//
// client.SetProxy("http://proxyserver:8888")
//
-// OR Without this `SetProxy` method, you could also set Proxy via environment variable.
-//
-// Refer to godoc `http.ProxyFromEnvironment`.
+// OR you could also set Proxy via environment variable, refer to [http.ProxyFromEnvironment]
func (c *Client) SetProxy(proxyURL string) *Client {
transport, err := c.Transport()
if err != nil {
@@ -846,7 +827,7 @@ func (c *Client) SetProxy(proxyURL string) *Client {
return c
}
-// RemoveProxy method removes the proxy configuration from Resty client
+// RemoveProxy method removes the proxy configuration from the Resty client
//
// client.RemoveProxy()
func (c *Client) RemoveProxy() *Client {
@@ -860,7 +841,7 @@ func (c *Client) RemoveProxy() *Client {
return c
}
-// SetCertificates method helps to set client certificates into Resty conveniently.
+// SetCertificates method helps to conveniently set client certificates into Resty.
func (c *Client) SetCertificates(certs ...tls.Certificate) *Client {
config, err := c.tlsConfig()
if err != nil {
@@ -871,7 +852,7 @@ func (c *Client) SetCertificates(certs ...tls.Certificate) *Client {
return c
}
-// SetRootCertificate method helps to add one or more root certificates into Resty client
+// SetRootCertificate method helps to add one or more root certificates into the Resty client
//
// client.SetRootCertificate("/path/to/root/pemFile.pem")
func (c *Client) SetRootCertificate(pemFilePath string) *Client {
@@ -880,40 +861,66 @@ func (c *Client) SetRootCertificate(pemFilePath string) *Client {
c.log.Errorf("%v", err)
return c
}
+ c.handleCAs("root", rootPemData)
+ return c
+}
- config, err := c.tlsConfig()
+// SetRootCertificateFromString method helps to add one or more root certificates
+// into the Resty client
+//
+// client.SetRootCertificateFromString("pem certs content")
+func (c *Client) SetRootCertificateFromString(pemCerts string) *Client {
+ c.handleCAs("root", []byte(pemCerts))
+ return c
+}
+
+// SetClientRootCertificate method helps to add one or more client's root
+// certificates into the Resty client
+//
+// client.SetClientRootCertificate("/path/to/root/pemFile.pem")
+func (c *Client) SetClientRootCertificate(pemFilePath string) *Client {
+ rootPemData, err := os.ReadFile(pemFilePath)
if err != nil {
c.log.Errorf("%v", err)
return c
}
- if config.RootCAs == nil {
- config.RootCAs = x509.NewCertPool()
- }
-
- config.RootCAs.AppendCertsFromPEM(rootPemData)
+ c.handleCAs("client", rootPemData)
return c
}
-// SetRootCertificateFromString method helps to add one or more root certificates into Resty client
+// SetClientRootCertificateFromString method helps to add one or more clients
+// root certificates into the Resty client
//
-// client.SetRootCertificateFromString("pem file content")
-func (c *Client) SetRootCertificateFromString(pemContent string) *Client {
+// client.SetClientRootCertificateFromString("pem certs content")
+func (c *Client) SetClientRootCertificateFromString(pemCerts string) *Client {
+ c.handleCAs("client", []byte(pemCerts))
+ return c
+}
+
+func (c *Client) handleCAs(scope string, permCerts []byte) {
config, err := c.tlsConfig()
if err != nil {
c.log.Errorf("%v", err)
- return c
- }
- if config.RootCAs == nil {
- config.RootCAs = x509.NewCertPool()
+ return
}
- config.RootCAs.AppendCertsFromPEM([]byte(pemContent))
- return c
+ switch scope {
+ case "root":
+ if config.RootCAs == nil {
+ config.RootCAs = x509.NewCertPool()
+ }
+ config.RootCAs.AppendCertsFromPEM(permCerts)
+ case "client":
+ if config.ClientCAs == nil {
+ config.ClientCAs = x509.NewCertPool()
+ }
+ config.ClientCAs.AppendCertsFromPEM(permCerts)
+ }
}
-// SetOutputDirectory method sets output directory for saving HTTP response into file.
-// If the output directory not exists then resty creates one. This setting is optional one,
-// if you're planning using absolute path in `Request.SetOutput` and can used together.
+// SetOutputDirectory method sets the output directory for saving HTTP responses in a file.
+// Resty creates one if the output directory does not exist. This setting is optional,
+// if you plan to use the absolute path in [Request.SetOutput] and can used together.
//
// client.SetOutputDirectory("/save/http/response/here")
func (c *Client) SetOutputDirectory(dirPath string) *Client {
@@ -921,24 +928,15 @@ func (c *Client) SetOutputDirectory(dirPath string) *Client {
return c
}
-// SetRateLimiter sets an optional `RateLimiter`. If set the rate limiter will control
-// all requests made with this client.
-//
-// Since v2.9.0
+// SetRateLimiter sets an optional [RateLimiter]. If set, the rate limiter will control
+// all requests were made by this client.
func (c *Client) SetRateLimiter(rl RateLimiter) *Client {
c.rateLimiter = rl
return c
}
-// SetTransport method sets custom `*http.Transport` or any `http.RoundTripper`
-// compatible interface implementation in the resty client.
-//
-// Note:
-//
-// - If transport is not type of `*http.Transport` then you may not be able to
-// take advantage of some of the Resty client settings.
-//
-// - It overwrites the Resty client transport instance and it's configurations.
+// SetTransport method sets custom [http.Transport] or any [http.RoundTripper]
+// compatible interface implementation in the Resty client.
//
// transport := &http.Transport{
// // something like Proxying to httptest.Server, etc...
@@ -946,8 +944,12 @@ func (c *Client) SetRateLimiter(rl RateLimiter) *Client {
// return url.Parse(server.URL)
// },
// }
-//
// client.SetTransport(transport)
+//
+// NOTE:
+// - If transport is not the type of `*http.Transport`, then you may not be able to
+// take advantage of some of the Resty client settings.
+// - It overwrites the Resty client transport instance and its configurations.
func (c *Client) SetTransport(transport http.RoundTripper) *Client {
if transport != nil {
c.httpClient.Transport = transport
@@ -955,7 +957,7 @@ func (c *Client) SetTransport(transport http.RoundTripper) *Client {
return c
}
-// SetScheme method sets custom scheme in the Resty client. It's way to override default.
+// SetScheme method sets a custom scheme for the Resty client. It's a way to override the default.
//
// client.SetScheme("http")
func (c *Client) SetScheme(scheme string) *Client {
@@ -965,25 +967,26 @@ func (c *Client) SetScheme(scheme string) *Client {
return c
}
-// SetCloseConnection method sets variable `Close` in http request struct with the given
+// SetCloseConnection method sets variable `Close` in HTTP request struct with the given
// value. More info: https://golang.org/src/net/http/request.go
func (c *Client) SetCloseConnection(close bool) *Client {
c.closeConnection = close
return c
}
-// SetDoNotParseResponse method instructs `Resty` not to parse the response body automatically.
-// Resty exposes the raw response body as `io.ReadCloser`. Also do not forget to close the body,
-// otherwise you might get into connection leaks, no connection reuse.
+// SetDoNotParseResponse method instructs Resty not to parse the response body automatically.
+// Resty exposes the raw response body as [io.ReadCloser]. If you use it, do not
+// forget to close the body, otherwise, you might get into connection leaks, and connection
+// reuse may not happen.
//
-// Note: Response middlewares are not applicable, if you use this option. Basically you have
-// taken over the control of response parsing from `Resty`.
-func (c *Client) SetDoNotParseResponse(parse bool) *Client {
- c.notParseResponse = parse
+// NOTE: [Response] middlewares are not executed using this option. You have
+// taken over the control of response parsing from Resty.
+func (c *Client) SetDoNotParseResponse(notParse bool) *Client {
+ c.notParseResponse = notParse
return c
}
-// SetPathParam method sets single URL path key-value pair in the
+// SetPathParam method sets a single URL path key-value pair in the
// Resty client instance.
//
// client.SetPathParam("userId", "sample@sample.com")
@@ -993,10 +996,10 @@ func (c *Client) SetDoNotParseResponse(parse bool) *Client {
// Composed URL - /v1/users/sample@sample.com/details
//
// It replaces the value of the key while composing the request URL.
-// The value will be escaped using `url.PathEscape` function.
+// The value will be escaped using [url.PathEscape] function.
//
-// Also it can be overridden at request level Path Params options,
-// see `Request.SetPathParam` or `Request.SetPathParams`.
+// It can be overridden at the request level,
+// see [Request.SetPathParam] or [Request.SetPathParams]
func (c *Client) SetPathParam(param, value string) *Client {
c.PathParams[param] = value
return c
@@ -1016,10 +1019,10 @@ func (c *Client) SetPathParam(param, value string) *Client {
// Composed URL - /v1/users/sample@sample.com/100002/groups%2Fdevelopers/details
//
// It replaces the value of the key while composing the request URL.
-// The values will be escaped using `url.PathEscape` function.
+// The values will be escaped using [url.PathEscape] function.
//
-// Also it can be overridden at request level Path Params options,
-// see `Request.SetPathParam` or `Request.SetPathParams`.
+// It can be overridden at the request level,
+// see [Request.SetPathParam] or [Request.SetPathParams]
func (c *Client) SetPathParams(params map[string]string) *Client {
for p, v := range params {
c.SetPathParam(p, v)
@@ -1027,7 +1030,7 @@ func (c *Client) SetPathParams(params map[string]string) *Client {
return c
}
-// SetRawPathParam method sets single URL path key-value pair in the
+// SetRawPathParam method sets a single URL path key-value pair in the
// Resty client instance.
//
// client.SetPathParam("userId", "sample@sample.com")
@@ -1045,10 +1048,8 @@ func (c *Client) SetPathParams(params map[string]string) *Client {
// It replaces the value of the key while composing the request URL.
// The value will be used as it is and will not be escaped.
//
-// Also it can be overridden at request level Path Params options,
-// see `Request.SetPathParam` or `Request.SetPathParams`.
-//
-// Since v2.8.0
+// It can be overridden at the request level,
+// see [Request.SetRawPathParam] or [Request.SetRawPathParams]
func (c *Client) SetRawPathParam(param, value string) *Client {
c.RawPathParams[param] = value
return c
@@ -1070,10 +1071,8 @@ func (c *Client) SetRawPathParam(param, value string) *Client {
// It replaces the value of the key while composing the request URL.
// The values will be used as they are and will not be escaped.
//
-// Also it can be overridden at request level Path Params options,
-// see `Request.SetPathParam` or `Request.SetPathParams`.
-//
-// Since v2.8.0
+// It can be overridden at the request level,
+// see [Request.SetRawPathParam] or [Request.SetRawPathParams]
func (c *Client) SetRawPathParams(params map[string]string) *Client {
for p, v := range params {
c.SetRawPathParam(p, v)
@@ -1081,16 +1080,35 @@ func (c *Client) SetRawPathParams(params map[string]string) *Client {
return c
}
-// SetJSONEscapeHTML method is to enable/disable the HTML escape on JSON marshal.
+// SetJSONEscapeHTML method enables or disables the HTML escape on JSON marshal.
+// By default, escape HTML is false.
//
-// Note: This option only applicable to standard JSON Marshaller.
+// NOTE: This option only applies to the standard JSON Marshaller used by Resty.
+//
+// It can be overridden at the request level, see [Client.SetJSONEscapeHTML]
func (c *Client) SetJSONEscapeHTML(b bool) *Client {
c.jsonEscapeHTML = b
return c
}
+// SetResponseBodyLimit method sets a maximum body size limit in bytes on response,
+// avoid reading too much data to memory.
+//
+// Client will return [resty.ErrResponseBodyTooLarge] if the body size of the body
+// in the uncompressed response is larger than the limit.
+// Body size limit will not be enforced in the following cases:
+// - ResponseBodyLimit <= 0, which is the default behavior.
+// - [Request.SetOutput] is called to save response data to the file.
+// - "DoNotParseResponse" is set for client or request.
+//
+// It can be overridden at the request level; see [Request.SetResponseBodyLimit]
+func (c *Client) SetResponseBodyLimit(v int) *Client {
+ c.ResponseBodyLimit = v
+ return c
+}
+
// EnableTrace method enables the Resty client trace for the requests fired from
-// the client using `httptrace.ClientTrace` and provides insights.
+// the client using [httptrace.ClientTrace] and provides insights.
//
// client := resty.New().EnableTrace()
//
@@ -1098,42 +1116,53 @@ func (c *Client) SetJSONEscapeHTML(b bool) *Client {
// fmt.Println("Error:", err)
// fmt.Println("Trace Info:", resp.Request.TraceInfo())
//
-// Also `Request.EnableTrace` available too to get trace info for single request.
-//
-// Since v2.0.0
+// The method [Request.EnableTrace] is also available to get trace info for a single request.
func (c *Client) EnableTrace() *Client {
c.trace = true
return c
}
-// DisableTrace method disables the Resty client trace. Refer to `Client.EnableTrace`.
-//
-// Since v2.0.0
+// DisableTrace method disables the Resty client trace. Refer to [Client.EnableTrace].
func (c *Client) DisableTrace() *Client {
c.trace = false
return c
}
-// IsProxySet method returns the true is proxy is set from resty client otherwise
-// false. By default proxy is set from environment, refer to `http.ProxyFromEnvironment`.
+// EnableGenerateCurlOnDebug method enables the generation of CURL commands in the debug log.
+// It works in conjunction with debug mode.
+//
+// NOTE: Use with care.
+// - Potential to leak sensitive data from [Request] and [Response] in the debug log.
+// - Beware of memory usage since the request body is reread.
+func (c *Client) EnableGenerateCurlOnDebug() *Client {
+ c.generateCurlOnDebug = true
+ return c
+}
+
+// DisableGenerateCurlOnDebug method disables the option set by [Client.EnableGenerateCurlOnDebug].
+func (c *Client) DisableGenerateCurlOnDebug() *Client {
+ c.generateCurlOnDebug = false
+ return c
+}
+
+// IsProxySet method returns the true is proxy is set from the Resty client; otherwise
+// false. By default, the proxy is set from the environment variable; refer to [http.ProxyFromEnvironment].
func (c *Client) IsProxySet() bool {
return c.proxyURL != nil
}
-// GetClient method returns the current `http.Client` used by the resty client.
+// GetClient method returns the underlying [http.Client] used by the Resty.
func (c *Client) GetClient() *http.Client {
return c.httpClient
}
// Clone returns a clone of the original client.
//
-// Be careful when using this function:
-// - Interface values are not deeply cloned. Thus, both the original and the clone will use the
-// same value.
-// - This function is not safe for concurrent use. You should only use this when you are sure that
-// the client is not being used by any other goroutine.
-//
-// Since v2.12.0
+// NOTE: Use with care:
+// - Interface values are not deeply cloned. Thus, both the original and the
+// clone will use the same value.
+// - This function is not safe for concurrent use. You should only use this method
+// when you are sure that any other goroutine is not using the client.
func (c *Client) Clone() *Client {
// dereference the pointer and copy the value
cc := *c
@@ -1144,10 +1173,6 @@ func (c *Client) Clone() *Client {
return &cc
}
-//‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Client Unexported methods
-//_______________________________________________________________________
-
func (c *Client) executeBefore(req *Request) error {
// Lock the user-defined pre-request hooks.
c.udBeforeRequestLock.RLock()
@@ -1202,8 +1227,8 @@ func (c *Client) executeBefore(req *Request) error {
return nil
}
-// Executes method executes the given `Request` object and returns response
-// error.
+// Executes method executes the given `Request` object and returns
+// response or error.
func (c *Client) execute(req *Request) (*Response, error) {
if err := c.executeBefore(req); err != nil {
return nil, err
@@ -1218,8 +1243,12 @@ func (c *Client) execute(req *Request) (*Response, error) {
}
if err != nil || req.notParseResponse || c.notParseResponse {
+ logErr := responseLogger(c, response)
response.setReceivedAt()
- return response, err
+ if err != nil {
+ return response, errors.Join(err, logErr)
+ }
+ return response, wrapNoRetryErr(logErr)
}
if !req.isSaveResponse {
@@ -1231,6 +1260,7 @@ func (c *Client) execute(req *Request) (*Response, error) {
if _, ok := body.(*gzip.Reader); !ok {
body, err = gzip.NewReader(body)
if err != nil {
+ err = errors.Join(err, responseLogger(c, response))
response.setReceivedAt()
return response, err
}
@@ -1238,7 +1268,8 @@ func (c *Client) execute(req *Request) (*Response, error) {
}
}
- if response.body, err = io.ReadAll(body); err != nil {
+ if response.body, err = readAllWithLimit(body, req.responseBodyLimit); err != nil {
+ err = errors.Join(err, responseLogger(c, response))
response.setReceivedAt()
return response, err
}
@@ -1249,6 +1280,11 @@ func (c *Client) execute(req *Request) (*Response, error) {
response.setReceivedAt() // after we read the body
// Apply Response middleware
+ err = responseLogger(c, response)
+ if err != nil {
+ return response, wrapNoRetryErr(err)
+ }
+
for _, f := range c.afterResponse {
if err = f(c, response); err != nil {
break
@@ -1258,6 +1294,39 @@ func (c *Client) execute(req *Request) (*Response, error) {
return response, wrapNoRetryErr(err)
}
+var ErrResponseBodyTooLarge = errors.New("resty: response body too large")
+
+// https://github.com/golang/go/issues/51115
+// [io.LimitedReader] can only return [io.EOF]
+func readAllWithLimit(r io.Reader, maxSize int) ([]byte, error) {
+ if maxSize <= 0 {
+ return io.ReadAll(r)
+ }
+
+ var buf [512]byte // make buf stack allocated
+ result := make([]byte, 0, 512)
+ total := 0
+ for {
+ n, err := r.Read(buf[:])
+ total += n
+ if total > maxSize {
+ return nil, ErrResponseBodyTooLarge
+ }
+
+ if err != nil {
+ if err == io.EOF {
+ result = append(result, buf[:n]...)
+ break
+ }
+ return nil, err
+ }
+
+ result = append(result, buf[:n]...)
+ }
+
+ return result, nil
+}
+
// getting TLS client config if not exists then create one
func (c *Client) tlsConfig() (*tls.Config, error) {
transport, err := c.Transport()
@@ -1270,10 +1339,10 @@ func (c *Client) tlsConfig() (*tls.Config, error) {
return transport.TLSClientConfig, nil
}
-// Transport method returns `*http.Transport` currently in use or error
-// in case currently used `transport` is not a `*http.Transport`.
+// Transport method returns [http.Transport] currently in use or error
+// in case the currently used `transport` is not a [http.Transport].
//
-// Since v2.8.0 become exported method.
+// Since v2.8.0 has become exported method.
func (c *Client) Transport() (*http.Transport, error) {
if transport, ok := c.httpClient.Transport.(*http.Transport); ok {
return transport, nil
@@ -1287,7 +1356,7 @@ func (c *Client) outputLogTo(w io.Writer) *Client {
return c
}
-// ResponseError is a wrapper for including the server response with an error.
+// ResponseError is a wrapper that includes the server response with an error.
// Neither the err nor the response should be nil.
type ResponseError struct {
Response *Response
@@ -1303,7 +1372,7 @@ func (e *ResponseError) Unwrap() error {
}
// Helper to run errorHooks hooks.
-// It wraps the error in a ResponseError if the resp is not nil
+// It wraps the error in a [ResponseError] if the resp is not nil
// so hooks can access it.
func (c *Client) onErrorHooks(req *Request, resp *Response, err error) {
if err != nil {
@@ -1338,14 +1407,14 @@ func (c *Client) onInvalidHooks(req *Request, err error) {
// File struct and its methods
//_______________________________________________________________________
-// File struct represent file information for multipart request
+// File struct represents file information for multipart request
type File struct {
Name string
ParamName string
io.Reader
}
-// String returns string value of current file details
+// String method returns the string value of current file details
func (f *File) String() string {
return fmt.Sprintf("ParamName: %v; FileName: %v", f.ParamName, f.Name)
}
@@ -1354,7 +1423,7 @@ func (f *File) String() string {
// MultipartField struct
//_______________________________________________________________________
-// MultipartField struct represent custom data part for multipart request
+// MultipartField struct represents the custom data part for a multipart request
type MultipartField struct {
Param string
FileName string
@@ -1362,10 +1431,6 @@ type MultipartField struct {
io.Reader
}
-//‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Unexported package methods
-//_______________________________________________________________________
-
func createClient(hc *http.Client) *Client {
if hc.Transport == nil {
hc.Transport = createTransport(nil)
@@ -1411,7 +1476,6 @@ func createClient(hc *http.Client) *Client {
// default after response middlewares
c.afterResponse = []ResponseMiddleware{
- responseLogger,
parseResponseBody,
saveResponseIntoFile,
}
diff --git a/vendor/github.com/go-resty/resty/v2/middleware.go b/vendor/github.com/go-resty/resty/v2/middleware.go
index 41e6561f22..84f0fdea04 100644
--- a/vendor/github.com/go-resty/resty/v2/middleware.go
+++ b/vendor/github.com/go-resty/resty/v2/middleware.go
@@ -308,7 +308,7 @@ func addCredentials(c *Client, r *Request) error {
}
func createCurlCmd(c *Client, r *Request) (err error) {
- if r.trace {
+ if r.Debug && r.generateCurlOnDebug {
if r.resultCurlCmd == nil {
r.resultCurlCmd = new(string)
}
@@ -338,10 +338,14 @@ func requestLogger(c *Client, r *Request) error {
}
}
- reqLog := "\n==============================================================================\n" +
- "~~~ REQUEST(curl) ~~~\n" +
- fmt.Sprintf("CURL:\n %v\n", buildCurlRequest(r.RawRequest, r.client.httpClient.Jar)) +
- "~~~ REQUEST ~~~\n" +
+ reqLog := "\n==============================================================================\n"
+
+ if r.Debug && r.generateCurlOnDebug {
+ reqLog += "~~~ REQUEST(CURL) ~~~\n" +
+ fmt.Sprintf(" %v\n", *r.resultCurlCmd)
+ }
+
+ reqLog += "~~~ REQUEST ~~~\n" +
fmt.Sprintf("%s %s %s\n", r.Method, rr.URL.RequestURI(), rr.Proto) +
fmt.Sprintf("HOST : %s\n", rr.URL.Host) +
fmt.Sprintf("HEADERS:\n%s\n", composeHeaders(c, r, rl.Header)) +
@@ -429,6 +433,13 @@ func handleMultipart(c *Client, r *Request) error {
r.bodyBuf = acquireBuffer()
w := multipart.NewWriter(r.bodyBuf)
+ // Set boundary if not set by user
+ if r.multipartBoundary != "" {
+ if err := w.SetBoundary(r.multipartBoundary); err != nil {
+ return err
+ }
+ }
+
for k, v := range c.FormData {
for _, iv := range v {
if err := w.WriteField(k, iv); err != nil {
diff --git a/vendor/github.com/go-resty/resty/v2/redirect.go b/vendor/github.com/go-resty/resty/v2/redirect.go
index 19bd587df9..bb016e2771 100644
--- a/vendor/github.com/go-resty/resty/v2/redirect.go
+++ b/vendor/github.com/go-resty/resty/v2/redirect.go
@@ -13,22 +13,22 @@ import (
)
var (
- // Since v2.8.0
ErrAutoRedirectDisabled = errors.New("auto redirect is disabled")
)
type (
- // RedirectPolicy to regulate the redirects in the resty client.
- // Objects implementing the RedirectPolicy interface can be registered as
+ // RedirectPolicy to regulate the redirects in the Resty client.
+ // Objects implementing the [RedirectPolicy] interface can be registered as
//
- // Apply function should return nil to continue the redirect journey, otherwise
+ // Apply function should return nil to continue the redirect journey; otherwise
// return error to stop the redirect.
RedirectPolicy interface {
Apply(req *http.Request, via []*http.Request) error
}
- // The RedirectPolicyFunc type is an adapter to allow the use of ordinary functions as RedirectPolicy.
- // If f is a function with the appropriate signature, RedirectPolicyFunc(f) is a RedirectPolicy object that calls f.
+ // The [RedirectPolicyFunc] type is an adapter to allow the use of ordinary
+ // functions as [RedirectPolicy]. If `f` is a function with the appropriate
+ // signature, RedirectPolicyFunc(f) is a RedirectPolicy object that calls `f`.
RedirectPolicyFunc func(*http.Request, []*http.Request) error
)
@@ -37,7 +37,7 @@ func (f RedirectPolicyFunc) Apply(req *http.Request, via []*http.Request) error
return f(req, via)
}
-// NoRedirectPolicy is used to disable redirects in the HTTP client
+// NoRedirectPolicy is used to disable redirects in the Resty client
//
// resty.SetRedirectPolicy(NoRedirectPolicy())
func NoRedirectPolicy() RedirectPolicy {
@@ -46,7 +46,7 @@ func NoRedirectPolicy() RedirectPolicy {
})
}
-// FlexibleRedirectPolicy is convenient method to create No of redirect policy for HTTP client.
+// FlexibleRedirectPolicy method is convenient for creating several redirect policies for Resty clients.
//
// resty.SetRedirectPolicy(FlexibleRedirectPolicy(20))
func FlexibleRedirectPolicy(noOfRedirect int) RedirectPolicy {
@@ -59,8 +59,8 @@ func FlexibleRedirectPolicy(noOfRedirect int) RedirectPolicy {
})
}
-// DomainCheckRedirectPolicy is convenient method to define domain name redirect rule in resty client.
-// Redirect is allowed for only mentioned host in the policy.
+// DomainCheckRedirectPolicy method is convenient for defining domain name redirect rules in Resty clients.
+// Redirect is allowed only for the host mentioned in the policy.
//
// resty.SetRedirectPolicy(DomainCheckRedirectPolicy("host1.com", "host2.org", "host3.net"))
func DomainCheckRedirectPolicy(hostnames ...string) RedirectPolicy {
@@ -80,10 +80,6 @@ func DomainCheckRedirectPolicy(hostnames ...string) RedirectPolicy {
return fn
}
-//‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Package Unexported methods
-//_______________________________________________________________________
-
func getHostname(host string) (hostname string) {
if strings.Index(host, ":") > 0 {
host, _, _ = net.SplitHostPort(host)
@@ -92,10 +88,11 @@ func getHostname(host string) (hostname string) {
return
}
-// By default Golang will not redirect request headers
-// after go throwing various discussion comments from thread
+// By default, Golang will not redirect request headers.
+// After reading through the various discussion comments from the thread -
// https://github.com/golang/go/issues/4800
-// Resty will add all the headers during a redirect for the same host
+// Resty will add all the headers during a redirect for the same host and
+// adds library user-agent if the Host is different.
func checkHostAndAddHeaders(cur *http.Request, pre *http.Request) {
curHostname := getHostname(cur.URL.Host)
preHostname := getHostname(pre.URL.Host)
diff --git a/vendor/github.com/go-resty/resty/v2/request.go b/vendor/github.com/go-resty/resty/v2/request.go
index 336925d5f0..183407152b 100644
--- a/vendor/github.com/go-resty/resty/v2/request.go
+++ b/vendor/github.com/go-resty/resty/v2/request.go
@@ -23,9 +23,9 @@ import (
// Request struct and methods
//_______________________________________________________________________
-// Request struct is used to compose and fire individual request from
-// resty client. Request provides an options to override client level
-// settings and also an options for the request composition.
+// Request struct is used to compose and fire individual requests from
+// Resty client. The [Request] provides an option to override client-level
+// settings and also an option for the request composition.
type Request struct {
URL string
Method string
@@ -49,8 +49,6 @@ type Request struct {
// Attempt is to represent the request attempt made during a Resty
// request execution flow, including retry count.
- //
- // Since v2.4.0
Attempt int
isMultiPart bool
@@ -69,31 +67,36 @@ type Request struct {
bodyBuf *bytes.Buffer
clientTrace *clientTrace
log Logger
+ multipartBoundary string
multipartFiles []*File
multipartFields []*MultipartField
retryConditions []RetryConditionFunc
+ responseBodyLimit int
+ generateCurlOnDebug bool
}
-// Generate curl command for the request.
+// GenerateCurlCommand method generates the CURL command for the request.
func (r *Request) GenerateCurlCommand() string {
+ if !(r.Debug && r.generateCurlOnDebug) {
+ return ""
+ }
+
if r.resultCurlCmd != nil {
return *r.resultCurlCmd
- } else {
- if r.RawRequest == nil {
- r.client.executeBefore(r) // mock with r.Get("/")
- }
- if r.resultCurlCmd == nil {
- r.resultCurlCmd = new(string)
- }
- if *r.resultCurlCmd == "" {
- *r.resultCurlCmd = buildCurlRequest(r.RawRequest, r.client.httpClient.Jar)
- }
- return *r.resultCurlCmd
}
+
+ if r.RawRequest == nil {
+ r.client.executeBefore(r) // mock with r.Get("/")
+ }
+ if r.resultCurlCmd == nil {
+ r.resultCurlCmd = new(string)
+ }
+ *r.resultCurlCmd = buildCurlRequest(r.RawRequest, r.client.httpClient.Jar)
+ return *r.resultCurlCmd
}
-// Context method returns the Context if its already set in request
-// otherwise it creates new one using `context.Background()`.
+// Context method returns the Context if it is already set in the [Request]
+// otherwise, it creates a new one using [context.Background].
func (r *Request) Context() context.Context {
if r.ctx == nil {
return context.Background()
@@ -101,16 +104,16 @@ func (r *Request) Context() context.Context {
return r.ctx
}
-// SetContext method sets the context.Context for current Request. It allows
-// to interrupt the request execution if ctx.Done() channel is closed.
-// See https://blog.golang.org/context article and the "context" package
+// SetContext method sets the [context.Context] for current [Request]. It allows
+// to interrupt the request execution if `ctx.Done()` channel is closed.
+// See https://blog.golang.org/context article and the package [context]
// documentation.
func (r *Request) SetContext(ctx context.Context) *Request {
r.ctx = ctx
return r
}
-// SetHeader method is to set a single header field and its value in the current request.
+// SetHeader method sets a single header field and its value in the current request.
//
// For Example: To set `Content-Type` and `Accept` as `application/json`.
//
@@ -118,13 +121,13 @@ func (r *Request) SetContext(ctx context.Context) *Request {
// SetHeader("Content-Type", "application/json").
// SetHeader("Accept", "application/json")
//
-// Also you can override header value, which was set at client instance level.
+// It overrides the header value set at the client instance level.
func (r *Request) SetHeader(header, value string) *Request {
r.Header.Set(header, value)
return r
}
-// SetHeaders method sets multiple headers field and its values at one go in the current request.
+// SetHeaders method sets multiple header fields and their values at one go in the current request.
//
// For Example: To set `Content-Type` and `Accept` as `application/json`
//
@@ -134,7 +137,7 @@ func (r *Request) SetHeader(header, value string) *Request {
// "Accept": "application/json",
// })
//
-// Also you can override header value, which was set at client instance level.
+// It overrides the header value set at the client instance level.
func (r *Request) SetHeaders(headers map[string]string) *Request {
for h, v := range headers {
r.SetHeader(h, v)
@@ -142,7 +145,7 @@ func (r *Request) SetHeaders(headers map[string]string) *Request {
return r
}
-// SetHeaderMultiValues sets multiple headers fields and its values is list of strings at one go in the current request.
+// SetHeaderMultiValues sets multiple header fields and their values as a list of strings in the current request.
//
// For Example: To set `Accept` as `text/html, application/xhtml+xml, application/xml;q=0.9, image/webp, */*;q=0.8`
//
@@ -151,7 +154,7 @@ func (r *Request) SetHeaders(headers map[string]string) *Request {
// "Accept": []string{"text/html", "application/xhtml+xml", "application/xml;q=0.9", "image/webp", "*/*;q=0.8"},
// })
//
-// Also you can override header value, which was set at client instance level.
+// It overrides the header value set at the client instance level.
func (r *Request) SetHeaderMultiValues(headers map[string][]string) *Request {
for key, values := range headers {
r.SetHeader(key, strings.Join(values, ", "))
@@ -159,7 +162,7 @@ func (r *Request) SetHeaderMultiValues(headers map[string][]string) *Request {
return r
}
-// SetHeaderVerbatim method is to set a single header field and its value verbatim in the current request.
+// SetHeaderVerbatim method sets a single header field and its value verbatim in the current request.
//
// For Example: To set `all_lowercase` and `UPPERCASE` as `available`.
//
@@ -167,33 +170,31 @@ func (r *Request) SetHeaderMultiValues(headers map[string][]string) *Request {
// SetHeaderVerbatim("all_lowercase", "available").
// SetHeaderVerbatim("UPPERCASE", "available")
//
-// Also you can override header value, which was set at client instance level.
-//
-// Since v2.6.0
+// It overrides the header value set at the client instance level.
func (r *Request) SetHeaderVerbatim(header, value string) *Request {
r.Header[header] = []string{value}
return r
}
-// SetQueryParam method sets single parameter and its value in the current request.
-// It will be formed as query string for the request.
+// SetQueryParam method sets a single parameter and its value in the current request.
+// It will be formed as a query string for the request.
//
-// For Example: `search=kitchen%20papers&size=large` in the URL after `?` mark.
+// For Example: `search=kitchen%20papers&size=large` in the URL after the `?` mark.
//
// client.R().
// SetQueryParam("search", "kitchen papers").
// SetQueryParam("size", "large")
//
-// Also you can override query params value, which was set at client instance level.
+// It overrides the query parameter value set at the client instance level.
func (r *Request) SetQueryParam(param, value string) *Request {
r.QueryParam.Set(param, value)
return r
}
-// SetQueryParams method sets multiple parameters and its values at one go in the current request.
-// It will be formed as query string for the request.
+// SetQueryParams method sets multiple parameters and their values at one go in the current request.
+// It will be formed as a query string for the request.
//
-// For Example: `search=kitchen%20papers&size=large` in the URL after `?` mark.
+// For Example: `search=kitchen%20papers&size=large` in the URL after the `?` mark.
//
// client.R().
// SetQueryParams(map[string]string{
@@ -201,7 +202,7 @@ func (r *Request) SetQueryParam(param, value string) *Request {
// "size": "large",
// })
//
-// Also you can override query params value, which was set at client instance level.
+// It overrides the query parameter value set at the client instance level.
func (r *Request) SetQueryParams(params map[string]string) *Request {
for p, v := range params {
r.SetQueryParam(p, v)
@@ -210,17 +211,17 @@ func (r *Request) SetQueryParams(params map[string]string) *Request {
}
// SetQueryParamsFromValues method appends multiple parameters with multi-value
-// (`url.Values`) at one go in the current request. It will be formed as
+// ([url.Values]) at one go in the current request. It will be formed as
// query string for the request.
//
-// For Example: `status=pending&status=approved&status=open` in the URL after `?` mark.
+// For Example: `status=pending&status=approved&status=open` in the URL after the `?` mark.
//
// client.R().
// SetQueryParamsFromValues(url.Values{
// "status": []string{"pending", "approved", "open"},
// })
//
-// Also you can override query params value, which was set at client instance level.
+// It overrides the query parameter value set at the client instance level.
func (r *Request) SetQueryParamsFromValues(params url.Values) *Request {
for p, v := range params {
for _, pv := range v {
@@ -230,12 +231,12 @@ func (r *Request) SetQueryParamsFromValues(params url.Values) *Request {
return r
}
-// SetQueryString method provides ability to use string as an input to set URL query string for the request.
-//
-// Using String as an input
+// SetQueryString method provides the ability to use string as an input to set URL query string for the request.
//
// client.R().
// SetQueryString("productId=232&template=fresh-sample&cat=resty&source=google&kw=buy a lot more")
+//
+// It overrides the query parameter value set at the client instance level.
func (r *Request) SetQueryString(query string) *Request {
params, err := url.ParseQuery(strings.TrimSpace(query))
if err == nil {
@@ -250,9 +251,9 @@ func (r *Request) SetQueryString(query string) *Request {
return r
}
-// SetFormData method sets Form parameters and their values in the current request.
-// It's applicable only HTTP method `POST` and `PUT` and requests content type would be set as
-// `application/x-www-form-urlencoded`.
+// SetFormData method sets Form parameters and their values for the current request.
+// It applies only to HTTP methods `POST` and `PUT`, and by default requests
+// content type would be set as `application/x-www-form-urlencoded`.
//
// client.R().
// SetFormData(map[string]string{
@@ -260,7 +261,7 @@ func (r *Request) SetQueryString(query string) *Request {
// "user_id": "3455454545",
// })
//
-// Also you can override form data value, which was set at client instance level.
+// It overrides the form data value set at the client instance level.
func (r *Request) SetFormData(data map[string]string) *Request {
for k, v := range data {
r.FormData.Set(k, v)
@@ -269,14 +270,14 @@ func (r *Request) SetFormData(data map[string]string) *Request {
}
// SetFormDataFromValues method appends multiple form parameters with multi-value
-// (`url.Values`) at one go in the current request.
+// ([url.Values]) at one go in the current request.
//
// client.R().
// SetFormDataFromValues(url.Values{
// "search_criteria": []string{"book", "glass", "pencil"},
// })
//
-// Also you can override form data value, which was set at client instance level.
+// It overrides the form data value set at the client instance level.
func (r *Request) SetFormDataFromValues(data url.Values) *Request {
for k, v := range data {
for _, kv := range v {
@@ -286,14 +287,17 @@ func (r *Request) SetFormDataFromValues(data url.Values) *Request {
return r
}
-// SetBody method sets the request body for the request. It supports various realtime needs as easy.
-// We can say its quite handy or powerful. Supported request body data types is `string`,
-// `[]byte`, `struct`, `map`, `slice` and `io.Reader`. Body value can be pointer or non-pointer.
-// Automatic marshalling for JSON and XML content type, if it is `struct`, `map`, or `slice`.
+// SetBody method sets the request body for the request. It supports various practical needs as easy.
+// It's quite handy and powerful. Supported request body data types are `string`,
+// `[]byte`, `struct`, `map`, `slice` and [io.Reader].
+//
+// Body value can be pointer or non-pointer. Automatic marshalling for JSON and XML content type, if it is `struct`, `map`, or `slice`.
+//
+// NOTE: [io.Reader] is processed in bufferless mode while sending a request.
//
-// Note: `io.Reader` is processed as bufferless mode while sending request.
+// For Example:
//
-// For Example: Struct as a body input, based on content type, it will be marshalled.
+// `struct` gets marshaled based on the request header `Content-Type`.
//
// client.R().
// SetBody(User{
@@ -301,7 +305,7 @@ func (r *Request) SetFormDataFromValues(data url.Values) *Request {
// Password: "welcome2resty",
// })
//
-// Map as a body input, based on content type, it will be marshalled.
+// 'map` gets marshaled based on the request header `Content-Type`.
//
// client.R().
// SetBody(map[string]interface{}{
@@ -316,7 +320,7 @@ func (r *Request) SetFormDataFromValues(data url.Values) *Request {
// },
// })
//
-// String as a body input. Suitable for any need as a string input.
+// `string` as a body input. Suitable for any need as a string input.
//
// client.R().
// SetBody(`{
@@ -324,27 +328,41 @@ func (r *Request) SetFormDataFromValues(data url.Values) *Request {
// "password": "admin"
// }`)
//
-// []byte as a body input. Suitable for raw request such as file upload, serialize & deserialize, etc.
+// `[]byte` as a body input. Suitable for raw requests such as file upload, serialize & deserialize, etc.
//
// client.R().
// SetBody([]byte("This is my raw request, sent as-is"))
+//
+// and so on.
func (r *Request) SetBody(body interface{}) *Request {
r.Body = body
return r
}
-// SetResult method is to register the response `Result` object for automatic unmarshalling for the request,
-// if response status code is between 200 and 299 and content type either JSON or XML.
+// SetResult method is to register the response `Result` object for automatic
+// unmarshalling of the HTTP response if the response status code is
+// between 200 and 299, and the content type is JSON or XML.
+//
+// Note: [Request.SetResult] input can be a pointer or non-pointer.
+//
+// The pointer with handle
//
-// Note: Result object can be pointer or non-pointer.
+// authToken := &AuthToken{}
+// client.R().SetResult(authToken)
+//
+// // Can be accessed via -
+// fmt.Println(authToken) OR fmt.Println(response.Result().(*AuthToken))
+//
+// OR -
+//
+// The pointer without handle or non-pointer
//
// client.R().SetResult(&AuthToken{})
// // OR
// client.R().SetResult(AuthToken{})
//
-// Accessing a result value from response instance.
-//
-// response.Result().(*AuthToken)
+// // Can be accessed via -
+// fmt.Println(response.Result().(*AuthToken))
func (r *Request) SetResult(res interface{}) *Request {
if res != nil {
r.Result = getPointer(res)
@@ -353,23 +371,25 @@ func (r *Request) SetResult(res interface{}) *Request {
}
// SetError method is to register the request `Error` object for automatic unmarshalling for the request,
-// if response status code is greater than 399 and content type either JSON or XML.
+// if the response status code is greater than 399 and the content type is either JSON or XML.
//
-// Note: Error object can be pointer or non-pointer.
+// NOTE: [Request.SetError] input can be a pointer or non-pointer.
//
// client.R().SetError(&AuthError{})
// // OR
// client.R().SetError(AuthError{})
//
-// Accessing a error value from response instance.
+// Accessing an error value from response instance.
//
// response.Error().(*AuthError)
+//
+// If this request Error object is nil, Resty will use the client-level error object Type if it is set.
func (r *Request) SetError(err interface{}) *Request {
r.Error = getPointer(err)
return r
}
-// SetFile method is to set single file field name and its path for multipart upload.
+// SetFile method sets a single file field name and its path for multipart upload.
//
// client.R().
// SetFile("my_file", "/Users/jeeva/Gas Bill - Sep.pdf")
@@ -379,7 +399,7 @@ func (r *Request) SetFile(param, filePath string) *Request {
return r
}
-// SetFiles method is to set multiple file field name and its path for multipart upload.
+// SetFiles method sets multiple file field names and their paths for multipart uploads.
//
// client.R().
// SetFiles(map[string]string{
@@ -395,7 +415,7 @@ func (r *Request) SetFiles(files map[string]string) *Request {
return r
}
-// SetFileReader method is to set single file using io.Reader for multipart upload.
+// SetFileReader method is to set a file using [io.Reader] for multipart upload.
//
// client.R().
// SetFileReader("profile_img", "my-profile-img.png", bytes.NewReader(profileImgBytes)).
@@ -410,7 +430,8 @@ func (r *Request) SetFileReader(param, fileName string, reader io.Reader) *Reque
return r
}
-// SetMultipartFormData method allows simple form data to be attached to the request as `multipart:form-data`
+// SetMultipartFormData method allows simple form data to be attached to the request
+// as `multipart:form-data`
func (r *Request) SetMultipartFormData(data map[string]string) *Request {
for k, v := range data {
r = r.SetMultipartField(k, "", "", strings.NewReader(v))
@@ -419,7 +440,7 @@ func (r *Request) SetMultipartFormData(data map[string]string) *Request {
return r
}
-// SetMultipartField method is to set custom data using io.Reader for multipart upload.
+// SetMultipartField method sets custom data with Content-Type using [io.Reader] for multipart upload.
func (r *Request) SetMultipartField(param, fileName, contentType string, reader io.Reader) *Request {
r.isMultiPart = true
r.multipartFields = append(r.multipartFields, &MultipartField{
@@ -431,7 +452,7 @@ func (r *Request) SetMultipartField(param, fileName, contentType string, reader
return r
}
-// SetMultipartFields method is to set multiple data fields using io.Reader for multipart upload.
+// SetMultipartFields method sets multiple data fields using [io.Reader] for multipart upload.
//
// For Example:
//
@@ -449,7 +470,7 @@ func (r *Request) SetMultipartField(param, fileName, contentType string, reader
// Reader: strings.NewReader(`{"input": {"name": "Uploaded document 2", "_filename" : ["file2.txt"]}}`),
// })
//
-// If you have slice already, then simply call-
+// If you have a `slice` of fields already, then call-
//
// client.R().SetMultipartFields(fields...)
func (r *Request) SetMultipartFields(fields ...*MultipartField) *Request {
@@ -458,13 +479,21 @@ func (r *Request) SetMultipartFields(fields ...*MultipartField) *Request {
return r
}
-// SetContentLength method sets the HTTP header `Content-Length` value for current request.
-// By default Resty won't set `Content-Length`. Also you have an option to enable for every
-// request.
+// SetMultipartBoundary method sets the custom multipart boundary for the multipart request.
+// Typically, the `mime/multipart` package generates a random multipart boundary if not provided.
+func (r *Request) SetMultipartBoundary(boundary string) *Request {
+ r.multipartBoundary = boundary
+ return r
+}
+
+// SetContentLength method sets the current request's HTTP header `Content-Length` value.
+// By default, Resty won't set `Content-Length`.
//
-// See `Client.SetContentLength`
+// See [Client.SetContentLength]
//
// client.R().SetContentLength(true)
+//
+// It overrides the value set at the client instance level.
func (r *Request) SetContentLength(l bool) *Request {
r.setContentLength = l
return r
@@ -480,7 +509,7 @@ func (r *Request) SetContentLength(l bool) *Request {
//
// client.R().SetBasicAuth("go-resty", "welcome")
//
-// This method overrides the credentials set by method `Client.SetBasicAuth`.
+// It overrides the credentials set by method [Client.SetBasicAuth].
func (r *Request) SetBasicAuth(username, password string) *Request {
r.UserInfo = &User{Username: username, Password: password}
return r
@@ -494,13 +523,15 @@ func (r *Request) SetBasicAuth(username, password string) *Request {
//
// client.R().SetAuthToken("BC594900518B4F7EAC75BD37F019E08FBC594900518B4F7EAC75BD37F019E08F")
//
-// This method overrides the Auth token set by method `Client.SetAuthToken`.
+// It overrides the Auth token set by method [Client.SetAuthToken].
func (r *Request) SetAuthToken(token string) *Request {
r.Token = token
return r
}
-// SetAuthScheme method sets the auth token scheme type in the HTTP request. For Example:
+// SetAuthScheme method sets the auth token scheme type in the HTTP request.
+//
+// Example Header value structure:
//
// Authorization:
//
@@ -508,33 +539,33 @@ func (r *Request) SetAuthToken(token string) *Request {
//
// client.R().SetAuthScheme("OAuth")
//
-// This auth header scheme gets added to all the request raised from this client instance.
-// Also it can be overridden or set one at the request level is supported.
+// // The outcome will be -
+// Authorization: OAuth
//
-// Information about Auth schemes can be found in RFC7235 which is linked to below along with the page containing
-// the currently defined official authentication schemes:
+// Information about Auth schemes can be found in [RFC 7235], IANA [HTTP Auth schemes]
//
-// https://tools.ietf.org/html/rfc7235
-// https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml#authschemes
+// It overrides the `Authorization` scheme set by method [Client.SetAuthScheme].
//
-// This method overrides the Authorization scheme set by method `Client.SetAuthScheme`.
+// [RFC 7235]: https://tools.ietf.org/html/rfc7235
+// [HTTP Auth schemes]: https://www.iana.org/assignments/http-authschemes/http-authschemes.xhtml#authschemes
func (r *Request) SetAuthScheme(scheme string) *Request {
r.AuthScheme = scheme
return r
}
-// SetDigestAuth method sets the Digest Access auth scheme for the HTTP request. If a server responds with 401 and sends
-// a Digest challenge in the WWW-Authenticate Header, the request will be resent with the appropriate Authorization Header.
+// SetDigestAuth method sets the Digest Access auth scheme for the HTTP request.
+// If a server responds with 401 and sends a Digest challenge in the WWW-Authenticate Header,
+// the request will be resent with the appropriate Authorization Header.
//
// For Example: To set the Digest scheme with username "Mufasa" and password "Circle Of Life"
//
// client.R().SetDigestAuth("Mufasa", "Circle Of Life")
//
-// Information about Digest Access Authentication can be found in RFC7616:
+// Information about Digest Access Authentication can be found in [RFC 7616]
//
-// https://datatracker.ietf.org/doc/html/rfc7616
+// It overrides the digest username and password set by method [Client.SetDigestAuth].
//
-// This method overrides the username and password set by method `Client.SetDigestAuth`.
+// [RFC 7616]: https://datatracker.ietf.org/doc/html/rfc7616
func (r *Request) SetDigestAuth(username, password string) *Request {
oldTransport := r.client.httpClient.Transport
r.client.OnBeforeRequest(func(c *Client, _ *Request) error {
@@ -552,16 +583,19 @@ func (r *Request) SetDigestAuth(username, password string) *Request {
return r
}
-// SetOutput method sets the output file for current HTTP request. Current HTTP response will be
-// saved into given file. It is similar to `curl -o` flag. Absolute path or relative path can be used.
-// If is it relative path then output file goes under the output directory, as mentioned
-// in the `Client.SetOutputDirectory`.
+// SetOutput method sets the output file for the current HTTP request. The current
+// HTTP response will be saved in the given file. It is similar to the `curl -o` flag.
+//
+// Absolute path or relative path can be used.
+//
+// If it is a relative path, then the output file goes under the output directory, as mentioned
+// in the [Client.SetOutputDirectory].
//
// client.R().
// SetOutput("/Users/jeeva/Downloads/ReplyWithHeader-v5.1-beta.zip").
// Get("http://bit.ly/1LouEKr")
//
-// Note: In this scenario `Response.Body` might be nil.
+// NOTE: In this scenario [Response.Body] might be nil.
func (r *Request) SetOutput(file string) *Request {
r.outputFile = file
r.isSaveResponse = true
@@ -579,18 +613,35 @@ func (r *Request) SetSRV(srv *SRVRecord) *Request {
return r
}
-// SetDoNotParseResponse method instructs `Resty` not to parse the response body automatically.
-// Resty exposes the raw response body as `io.ReadCloser`. Also do not forget to close the body,
-// otherwise you might get into connection leaks, no connection reuse.
+// SetDoNotParseResponse method instructs Resty not to parse the response body automatically.
+// Resty exposes the raw response body as [io.ReadCloser]. If you use it, do not
+// forget to close the body, otherwise, you might get into connection leaks, and connection
+// reuse may not happen.
//
-// Note: Response middlewares are not applicable, if you use this option. Basically you have
-// taken over the control of response parsing from `Resty`.
+// NOTE: [Response] middlewares are not executed using this option. You have
+// taken over the control of response parsing from Resty.
func (r *Request) SetDoNotParseResponse(parse bool) *Request {
r.notParseResponse = parse
return r
}
-// SetPathParam method sets single URL path key-value pair in the
+// SetResponseBodyLimit method sets a maximum body size limit in bytes on response,
+// avoid reading too much data to memory.
+//
+// Client will return [resty.ErrResponseBodyTooLarge] if the body size of the body
+// in the uncompressed response is larger than the limit.
+// Body size limit will not be enforced in the following cases:
+// - ResponseBodyLimit <= 0, which is the default behavior.
+// - [Request.SetOutput] is called to save response data to the file.
+// - "DoNotParseResponse" is set for client or request.
+//
+// It overrides the value set at the client instance level. see [Client.SetResponseBodyLimit]
+func (r *Request) SetResponseBodyLimit(v int) *Request {
+ r.responseBodyLimit = v
+ return r
+}
+
+// SetPathParam method sets a single URL path key-value pair in the
// Resty current request instance.
//
// client.R().SetPathParam("userId", "sample@sample.com")
@@ -606,10 +657,9 @@ func (r *Request) SetDoNotParseResponse(parse bool) *Request {
// Composed URL - /v1/users/groups%2Fdevelopers/details
//
// It replaces the value of the key while composing the request URL.
-// The values will be escaped using `url.PathEscape` function.
+// The values will be escaped using function [url.PathEscape].
//
-// Also you can override Path Params value, which was set at client instance
-// level.
+// It overrides the path parameter set at the client instance level.
func (r *Request) SetPathParam(param, value string) *Request {
r.PathParams[param] = value
return r
@@ -628,11 +678,10 @@ func (r *Request) SetPathParam(param, value string) *Request {
// URL - /v1/users/{userId}/{subAccountId}/{path}/details
// Composed URL - /v1/users/sample@sample.com/100002/groups%2Fdevelopers/details
//
-// It replaces the value of the key while composing request URL.
-// The value will be used as it is and will not be escaped.
+// It replaces the value of the key while composing the request URL.
+// The values will be escaped using function [url.PathEscape].
//
-// Also you can override Path Params value, which was set at client instance
-// level.
+// It overrides the path parameter set at the client instance level.
func (r *Request) SetPathParams(params map[string]string) *Request {
for p, v := range params {
r.SetPathParam(p, v)
@@ -640,7 +689,7 @@ func (r *Request) SetPathParams(params map[string]string) *Request {
return r
}
-// SetRawPathParam method sets single URL path key-value pair in the
+// SetRawPathParam method sets a single URL path key-value pair in the
// Resty current request instance.
//
// client.R().SetPathParam("userId", "sample@sample.com")
@@ -656,12 +705,9 @@ func (r *Request) SetPathParams(params map[string]string) *Request {
// Composed URL - /v1/users/groups/developers/details
//
// It replaces the value of the key while composing the request URL.
-// The value will be used as it is and will not be escaped.
+// The value will be used as-is and has not been escaped.
//
-// Also you can override Path Params value, which was set at client instance
-// level.
-//
-// Since v2.8.0
+// It overrides the raw path parameter set at the client instance level.
func (r *Request) SetRawPathParam(param, value string) *Request {
r.RawPathParams[param] = value
return r
@@ -680,13 +726,10 @@ func (r *Request) SetRawPathParam(param, value string) *Request {
// URL - /v1/users/{userId}/{subAccountId}/{path}/details
// Composed URL - /v1/users/sample@sample.com/100002/groups/developers/details
//
-// It replaces the value of the key while composing request URL.
-// The values will be used as they are and will not be escaped.
-//
-// Also you can override Path Params value, which was set at client instance
-// level.
+// It replaces the value of the key while composing the request URL.
+// The value will be used as-is and has not been escaped.
//
-// Since v2.8.0
+// It overrides the raw path parameter set at the client instance level.
func (r *Request) SetRawPathParams(params map[string]string) *Request {
for p, v := range params {
r.SetRawPathParam(p, v)
@@ -695,23 +738,29 @@ func (r *Request) SetRawPathParams(params map[string]string) *Request {
}
// ExpectContentType method allows to provide fallback `Content-Type` for automatic unmarshalling
-// when `Content-Type` response header is unavailable.
+// when the `Content-Type` response header is unavailable.
func (r *Request) ExpectContentType(contentType string) *Request {
r.fallbackContentType = contentType
return r
}
-// ForceContentType method provides a strong sense of response `Content-Type` for automatic unmarshalling.
-// Resty gives this a higher priority than the `Content-Type` response header. This means that if both
-// `Request.ForceContentType` is set and the response `Content-Type` is available, `ForceContentType` will win.
+// ForceContentType method provides a strong sense of response `Content-Type` for
+// automatic unmarshalling. Resty gives this a higher priority than the `Content-Type`
+// response header.
+//
+// This means that if both [Request.ForceContentType] is set and
+// the response `Content-Type` is available, `ForceContentType` will win.
func (r *Request) ForceContentType(contentType string) *Request {
r.forceContentType = contentType
return r
}
-// SetJSONEscapeHTML method is to enable/disable the HTML escape on JSON marshal.
+// SetJSONEscapeHTML method enables or disables the HTML escape on JSON marshal.
+// By default, escape HTML is false.
//
-// Note: This option only applicable to standard JSON Marshaller.
+// NOTE: This option only applies to the standard JSON Marshaller used by Resty.
+//
+// It overrides the value set at the client instance level, see [Client.SetJSONEscapeHTML]
func (r *Request) SetJSONEscapeHTML(b bool) *Request {
r.jsonEscapeHTML = b
return r
@@ -724,9 +773,7 @@ func (r *Request) SetJSONEscapeHTML(b bool) *Request {
// Value:"This is cookie value",
// })
//
-// Note: Method appends the Cookie value into existing Cookie if already existing.
-//
-// Since v2.1.0
+// NOTE: Method appends the Cookie value into existing Cookie even if its already existing.
func (r *Request) SetCookie(hc *http.Cookie) *Request {
r.Cookies = append(r.Cookies, hc)
return r
@@ -748,9 +795,7 @@ func (r *Request) SetCookie(hc *http.Cookie) *Request {
// // Setting a cookies into resty's current request
// client.R().SetCookies(cookies)
//
-// Note: Method appends the Cookie value into existing Cookie if already existing.
-//
-// Since v2.1.0
+// NOTE: Method appends the Cookie value into existing Cookie even if its already existing.
func (r *Request) SetCookies(rs []*http.Cookie) *Request {
r.Cookies = append(r.Cookies, rs...)
return r
@@ -759,30 +804,35 @@ func (r *Request) SetCookies(rs []*http.Cookie) *Request {
// SetLogger method sets given writer for logging Resty request and response details.
// By default, requests and responses inherit their logger from the client.
//
-// Compliant to interface `resty.Logger`.
+// Compliant to interface [resty.Logger].
+//
+// It overrides the logger value set at the client instance level.
func (r *Request) SetLogger(l Logger) *Request {
r.log = l
return r
}
-// SetDebug method enables the debug mode on current request Resty request, It logs
+// SetDebug method enables the debug mode on the current request. It logs
// the details current request and response.
-// For `Request` it logs information such as HTTP verb, Relative URL path, Host, Headers, Body if it has one.
-// For `Response` it logs information such as Status, Response Time, Headers, Body if it has one.
//
-// client.R().SetDebug(true)
+// client.SetDebug(true)
+//
+// Also, it can be enabled at the request level for a particular request; see [Request.SetDebug].
+// - For [Request], it logs information such as HTTP verb, Relative URL path,
+// Host, Headers, and Body if it has one.
+// - For [Response], it logs information such as Status, Response Time, Headers,
+// and Body if it has one.
func (r *Request) SetDebug(d bool) *Request {
r.Debug = d
return r
}
// AddRetryCondition method adds a retry condition function to the request's
-// array of functions that are checked to determine if the request is retried.
-// The request will retry if any of the functions return true and error is nil.
+// array of functions is checked to determine if the request can be retried.
+// The request will retry if any functions return true and the error is nil.
//
-// Note: These retry conditions are checked before all retry conditions of the client.
-//
-// Since v2.7.0
+// NOTE: The request level retry conditions are checked before all retry
+// conditions from the client instance.
func (r *Request) AddRetryCondition(condition RetryConditionFunc) *Request {
r.retryConditions = append(r.retryConditions, condition)
return r
@@ -793,7 +843,7 @@ func (r *Request) AddRetryCondition(condition RetryConditionFunc) *Request {
//_______________________________________________________________________
// EnableTrace method enables trace for the current request
-// using `httptrace.ClientTrace` and provides insights.
+// using [httptrace.ClientTrace] and provides insights.
//
// client := resty.New()
//
@@ -801,19 +851,33 @@ func (r *Request) AddRetryCondition(condition RetryConditionFunc) *Request {
// fmt.Println("Error:", err)
// fmt.Println("Trace Info:", resp.Request.TraceInfo())
//
-// See `Client.EnableTrace` available too to get trace info for all requests.
-//
-// Since v2.0.0
+// See [Client.EnableTrace] is also available to get trace info for all requests.
func (r *Request) EnableTrace() *Request {
r.trace = true
return r
}
-// TraceInfo method returns the trace info for the request.
-// If either the Client or Request EnableTrace function has not been called
-// prior to the request being made, an empty TraceInfo object will be returned.
+// EnableGenerateCurlOnDebug method enables the generation of CURL commands in the debug log.
+// It works in conjunction with debug mode. It overrides the options set by the [Client].
//
-// Since v2.0.0
+// NOTE: Use with care.
+// - Potential to leak sensitive data from [Request] and [Response] in the debug log.
+// - Beware of memory usage since the request body is reread.
+func (r *Request) EnableGenerateCurlOnDebug() *Request {
+ r.generateCurlOnDebug = true
+ return r
+}
+
+// DisableGenerateCurlOnDebug method disables the option set by [Request.EnableGenerateCurlOnDebug].
+// It overrides the options set by the [Client].
+func (r *Request) DisableGenerateCurlOnDebug() *Request {
+ r.generateCurlOnDebug = false
+ return r
+}
+
+// TraceInfo method returns the trace info for the request.
+// If either the [Client.EnableTrace] or [Request.EnableTrace] function has not been called
+// before the request is made, an empty [resty.TraceInfo] object is returned.
func (r *Request) TraceInfo() TraceInfo {
ct := r.clientTrace
@@ -902,7 +966,7 @@ func (r *Request) Patch(url string) (*Response, error) {
}
// Send method performs the HTTP request using the method and URL already defined
-// for current `Request`.
+// for current [Request].
//
// req := client.R()
// req.Method = resty.MethodGet
@@ -912,8 +976,8 @@ func (r *Request) Send() (*Response, error) {
return r.Execute(r.Method, r.URL)
}
-// Execute method performs the HTTP request with given HTTP method and URL
-// for current `Request`.
+// Execute method performs the HTTP request with the given HTTP method and URL
+// for current [Request].
//
// resp, err := client.R().Execute(resty.MethodGet, "http://httpbin.org/get")
func (r *Request) Execute(method, url string) (*Response, error) {
@@ -997,10 +1061,6 @@ type SRVRecord struct {
Domain string
}
-//‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Request Unexported methods
-//_______________________________________________________________________
-
func (r *Request) fmtBodyString(sl int64) (body string) {
body = "***** NO CONTENT *****"
if !isPayloadSupported(r.Method, r.client.AllowGetMethodPayload) {
diff --git a/vendor/github.com/go-resty/resty/v2/response.go b/vendor/github.com/go-resty/resty/v2/response.go
index 58a8e8169d..f52b5c61ff 100644
--- a/vendor/github.com/go-resty/resty/v2/response.go
+++ b/vendor/github.com/go-resty/resty/v2/response.go
@@ -17,7 +17,7 @@ import (
// Response struct and methods
//_______________________________________________________________________
-// Response struct holds response values of executed request.
+// Response struct holds response values of executed requests.
type Response struct {
Request *Request
RawResponse *http.Response
@@ -27,9 +27,10 @@ type Response struct {
receivedAt time.Time
}
-// Body method returns HTTP response as []byte array for the executed request.
+// Body method returns the HTTP response as `[]byte` slice for the executed request.
//
-// Note: `Response.Body` might be nil, if `Request.SetOutput` is used.
+// NOTE: [Response.Body] might be nil if [Request.SetOutput] is used.
+// Also see [Request.SetDoNotParseResponse], [Client.SetDoNotParseResponse]
func (r *Response) Body() []byte {
if r.RawResponse == nil {
return []byte{}
@@ -37,13 +38,11 @@ func (r *Response) Body() []byte {
return r.body
}
-// SetBody method is to set Response body in byte slice. Typically,
-// its helpful for test cases.
+// SetBody method sets [Response] body in byte slice. Typically,
+// It is helpful for test cases.
//
// resp.SetBody([]byte("This is test body content"))
// resp.SetBody(nil)
-//
-// Since v2.10.0
func (r *Response) SetBody(b []byte) *Response {
r.body = b
return r
@@ -78,11 +77,15 @@ func (r *Response) Proto() string {
}
// Result method returns the response value as an object if it has one
+//
+// See [Request.SetResult]
func (r *Response) Result() interface{} {
return r.Request.Result
}
// Error method returns the error object if it has one
+//
+// See [Request.SetError], [Client.SetError]
func (r *Response) Error() interface{} {
return r.Request.Error
}
@@ -95,7 +98,7 @@ func (r *Response) Header() http.Header {
return r.RawResponse.Header
}
-// Cookies method to access all the response cookies
+// Cookies method to returns all the response cookies
func (r *Response) Cookies() []*http.Cookie {
if r.RawResponse == nil {
return make([]*http.Cookie, 0)
@@ -103,7 +106,8 @@ func (r *Response) Cookies() []*http.Cookie {
return r.RawResponse.Cookies()
}
-// String method returns the body of the server response as String.
+// String method returns the body of the HTTP response as a `string`.
+// It returns an empty string if it is nil or the body is zero length.
func (r *Response) String() string {
if len(r.body) == 0 {
return ""
@@ -111,10 +115,11 @@ func (r *Response) String() string {
return strings.TrimSpace(string(r.body))
}
-// Time method returns the time of HTTP response time that from request we sent and received a request.
+// Time method returns the duration of HTTP response time from the request we sent
+// and received a request.
//
-// See `Response.ReceivedAt` to know when client received response and see `Response.Request.Time` to know
-// when client sent a request.
+// See [Response.ReceivedAt] to know when the client received a response and see
+// `Response.Request.Time` to know when the client sent a request.
func (r *Response) Time() time.Duration {
if r.Request.clientTrace != nil {
return r.Request.TraceInfo().TotalTime
@@ -122,23 +127,25 @@ func (r *Response) Time() time.Duration {
return r.receivedAt.Sub(r.Request.Time)
}
-// ReceivedAt method returns when response got received from server for the request.
+// ReceivedAt method returns the time we received a response from the server for the request.
func (r *Response) ReceivedAt() time.Time {
return r.receivedAt
}
-// Size method returns the HTTP response size in bytes. Ya, you can relay on HTTP `Content-Length` header,
-// however it won't be good for chucked transfer/compressed response. Since Resty calculates response size
-// at the client end. You will get actual size of the http response.
+// Size method returns the HTTP response size in bytes. Yeah, you can rely on HTTP `Content-Length`
+// header, however it won't be available for chucked transfer/compressed response.
+// Since Resty captures response size details when processing the response body
+// when possible. So that users get the actual size of response bytes.
func (r *Response) Size() int64 {
return r.size
}
-// RawBody method exposes the HTTP raw response body. Use this method in-conjunction with `SetDoNotParseResponse`
-// option otherwise you get an error as `read err: http: read on closed response body`.
+// RawBody method exposes the HTTP raw response body. Use this method in conjunction with
+// [Client.SetDoNotParseResponse] or [Request.SetDoNotParseResponse]
+// option; otherwise, you get an error as `read err: http: read on closed response body.`
//
// Do not forget to close the body, otherwise you might get into connection leaks, no connection reuse.
-// Basically you have taken over the control of response parsing from `Resty`.
+// You have taken over the control of response parsing from Resty.
func (r *Response) RawBody() io.ReadCloser {
if r.RawResponse == nil {
return nil
@@ -156,10 +163,6 @@ func (r *Response) IsError() bool {
return r.StatusCode() > 399
}
-//‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Response Unexported methods
-//_______________________________________________________________________
-
func (r *Response) setReceivedAt() {
r.receivedAt = time.Now()
if r.Request.clientTrace != nil {
@@ -168,6 +171,9 @@ func (r *Response) setReceivedAt() {
}
func (r *Response) fmtBodyString(sl int64) string {
+ if r.Request.client.notParseResponse || r.Request.notParseResponse {
+ return "***** DO NOT PARSE RESPONSE - Enabled *****"
+ }
if len(r.body) > 0 {
if int64(len(r.body)) > sl {
return fmt.Sprintf("***** RESPONSE TOO LARGE (size - %d) *****", len(r.body))
diff --git a/vendor/github.com/go-resty/resty/v2/resty.go b/vendor/github.com/go-resty/resty/v2/resty.go
index 7458af76c0..243df6e91c 100644
--- a/vendor/github.com/go-resty/resty/v2/resty.go
+++ b/vendor/github.com/go-resty/resty/v2/resty.go
@@ -14,7 +14,7 @@ import (
)
// Version # of resty
-const Version = "2.14.0"
+const Version = "2.15.1"
// New method creates a new Resty client.
func New() *Client {
@@ -24,12 +24,12 @@ func New() *Client {
})
}
-// NewWithClient method creates a new Resty client with given `http.Client`.
+// NewWithClient method creates a new Resty client with given [http.Client].
func NewWithClient(hc *http.Client) *Client {
return createClient(hc)
}
-// NewWithLocalAddr method creates a new Resty client with given Local Address
+// NewWithLocalAddr method creates a new Resty client with the given Local Address.
// to dial from.
func NewWithLocalAddr(localAddr net.Addr) *Client {
cookieJar, _ := cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List})
diff --git a/vendor/github.com/go-resty/resty/v2/retry.go b/vendor/github.com/go-resty/resty/v2/retry.go
index 932a266dc6..416107e4bb 100644
--- a/vendor/github.com/go-resty/resty/v2/retry.go
+++ b/vendor/github.com/go-resty/resty/v2/retry.go
@@ -23,7 +23,7 @@ type (
// Option is to create convenient retry options like wait time, max retries, etc.
Option func(*Options)
- // RetryConditionFunc type is for retry condition function
+ // RetryConditionFunc type is for the retry condition function
// input: non-nil Response OR request execution error
RetryConditionFunc func(*Response, error) bool
@@ -33,8 +33,8 @@ type (
// RetryAfterFunc returns time to wait before retry
// For example, it can parse HTTP Retry-After header
// https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
- // Non-nil error is returned if it is found that request is not retryable
- // (0, nil) is a special result means 'use default algorithm'
+ // Non-nil error is returned if it is found that the request is not retryable
+ // (0, nil) is a special result that means 'use default algorithm'
RetryAfterFunc func(*Client, *Response) (time.Duration, error)
// Options struct is used to hold retry settings.
@@ -69,7 +69,7 @@ func MaxWaitTime(value time.Duration) Option {
}
}
-// RetryConditions sets the conditions that will be checked for retry.
+// RetryConditions sets the conditions that will be checked for retry
func RetryConditions(conditions []RetryConditionFunc) Option {
return func(o *Options) {
o.retryConditions = conditions
@@ -84,7 +84,7 @@ func RetryHooks(hooks []OnRetryFunc) Option {
}
// ResetMultipartReaders sets a boolean value which will lead the start being seeked out
-// on all multipart file readers, if they implement io.ReadSeeker
+// on all multipart file readers if they implement [io.ReadSeeker]
func ResetMultipartReaders(value bool) Option {
return func(o *Options) {
o.resetReaders = value
@@ -202,7 +202,7 @@ func sleepDuration(resp *Response, min, max time.Duration, attempt int) (time.Du
}
// Return capped exponential backoff with jitter
-// http://www.awsarchitectureblog.com/2015/03/backoff.html
+// https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/
func jitterBackoff(min, max time.Duration, attempt int) time.Duration {
base := float64(min)
capLevel := float64(max)
diff --git a/vendor/github.com/go-resty/resty/v2/shellescape/BUILD.bazel b/vendor/github.com/go-resty/resty/v2/shellescape/BUILD.bazel
new file mode 100644
index 0000000000..fe829e3970
--- /dev/null
+++ b/vendor/github.com/go-resty/resty/v2/shellescape/BUILD.bazel
@@ -0,0 +1,14 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+ name = "shellescape",
+ srcs = ["shellescape.go"],
+ importpath = "github.com/go-resty/resty/v2/shellescape",
+ visibility = ["//visibility:public"],
+)
+
+alias(
+ name = "go_default_library",
+ actual = ":shellescape",
+ visibility = ["//visibility:public"],
+)
diff --git a/vendor/github.com/go-resty/resty/v2/shellescape/shellescape.go b/vendor/github.com/go-resty/resty/v2/shellescape/shellescape.go
index 5e6a379906..1e835cb3b7 100644
--- a/vendor/github.com/go-resty/resty/v2/shellescape/shellescape.go
+++ b/vendor/github.com/go-resty/resty/v2/shellescape/shellescape.go
@@ -1,5 +1,11 @@
+// Copyright (c) 2015-present Jeevanandam M (jeeva@myjeeva.com)
+// 2024 Ahuigo (https://github.com/ahuigo)
+// All rights reserved.
+// resty source code and usage is governed by a MIT style
+// license that can be found in the LICENSE file.
+
/*
-Package shellescape provides the shellescape.Quote to escape arbitrary
+Package shellescape provides the methods to escape arbitrary
strings for a safe use as command line arguments in the most common
POSIX shells.
@@ -19,8 +25,8 @@ func init() {
pattern = regexp.MustCompile(`[^\w@%+=:,./-]`)
}
-// Quote returns a shell-escaped version of the string s. The returned value
-// is a string that can safely be used as one token in a shell command line.
+// Quote method returns a shell-escaped version of the string. The returned value
+// can safely be used as one token in a shell command line.
func Quote(s string) string {
if len(s) == 0 {
return "''"
diff --git a/vendor/github.com/go-resty/resty/v2/trace.go b/vendor/github.com/go-resty/resty/v2/trace.go
index 7798a395d9..226bfbffcb 100644
--- a/vendor/github.com/go-resty/resty/v2/trace.go
+++ b/vendor/github.com/go-resty/resty/v2/trace.go
@@ -16,32 +16,30 @@ import (
// TraceInfo struct
//_______________________________________________________________________
-// TraceInfo struct is used provide request trace info such as DNS lookup
+// TraceInfo struct is used to provide request trace info such as DNS lookup
// duration, Connection obtain duration, Server processing duration, etc.
-//
-// Since v2.0.0
type TraceInfo struct {
- // DNSLookup is a duration that transport took to perform
+ // DNSLookup is the duration that transport took to perform
// DNS lookup.
DNSLookup time.Duration
- // ConnTime is a duration that took to obtain a successful connection.
+ // ConnTime is the duration it took to obtain a successful connection.
ConnTime time.Duration
- // TCPConnTime is a duration that took to obtain the TCP connection.
+ // TCPConnTime is the duration it took to obtain the TCP connection.
TCPConnTime time.Duration
- // TLSHandshake is a duration that TLS handshake took place.
+ // TLSHandshake is the duration of the TLS handshake.
TLSHandshake time.Duration
- // ServerTime is a duration that server took to respond first byte.
+ // ServerTime is the server's duration for responding to the first byte.
ServerTime time.Duration
- // ResponseTime is a duration since first response byte from server to
+ // ResponseTime is the duration since the first response byte from the server to
// request completion.
ResponseTime time.Duration
- // TotalTime is a duration that total request took end-to-end.
+ // TotalTime is the duration of the total time request taken end-to-end.
TotalTime time.Duration
// IsConnReused is whether this connection has been previously
@@ -52,7 +50,7 @@ type TraceInfo struct {
// idle pool.
IsConnWasIdle bool
- // ConnIdleTime is a duration how long the connection was previously
+ // ConnIdleTime is the duration how long the connection that was previously
// idle, if IsConnWasIdle is true.
ConnIdleTime time.Duration
@@ -68,9 +66,9 @@ type TraceInfo struct {
// ClientTrace struct and its methods
//_______________________________________________________________________
-// tracer struct maps the `httptrace.ClientTrace` hooks into Fields
-// with same naming for easy understanding. Plus additional insights
-// Request.
+// clientTrace struct maps the [httptrace.ClientTrace] hooks into Fields
+// with the same naming for easy understanding. Plus additional insights
+// [Request].
type clientTrace struct {
getConn time.Time
dnsStart time.Time
@@ -84,10 +82,6 @@ type clientTrace struct {
gotConnInfo httptrace.GotConnInfo
}
-//‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Trace unexported methods
-//_______________________________________________________________________
-
func (t *clientTrace) createContext(ctx context.Context) context.Context {
return httptrace.WithClientTrace(
ctx,
diff --git a/vendor/github.com/go-resty/resty/v2/util.go b/vendor/github.com/go-resty/resty/v2/util.go
index 7bbba912d1..812dce3d41 100644
--- a/vendor/github.com/go-resty/resty/v2/util.go
+++ b/vendor/github.com/go-resty/resty/v2/util.go
@@ -145,10 +145,6 @@ type ResponseLog struct {
Body string
}
-//‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Package Unexported methods
-//_______________________________________________________________________
-
// way to disable the HTML escape as opt-in
func jsonMarshal(c *Client, r *Request, d interface{}) (*bytes.Buffer, error) {
if !r.jsonEscapeHTML || !c.jsonEscapeHTML {
diff --git a/vendor/github.com/go-resty/resty/v2/util_curl.go b/vendor/github.com/go-resty/resty/v2/util_curl.go
index e50c3b3a69..2bd91270a6 100644
--- a/vendor/github.com/go-resty/resty/v2/util_curl.go
+++ b/vendor/github.com/go-resty/resty/v2/util_curl.go
@@ -14,6 +14,7 @@ import (
func buildCurlRequest(req *http.Request, httpCookiejar http.CookieJar) (curl string) {
// 1. Generate curl raw headers
+
curl = "curl -X " + req.Method + " "
// req.Host + req.URL.Path + "?" + req.URL.RawQuery + " " + req.Proto + " "
headers := dumpCurlHeaders(req)
@@ -22,6 +23,7 @@ func buildCurlRequest(req *http.Request, httpCookiejar http.CookieJar) (curl str
}
// 2. Generate curl cookies
+ // TODO validate this block of code, I think its not required since cookie captured via Headers
if cookieJar, ok := httpCookiejar.(*cookiejar.Jar); ok {
cookies := cookieJar.Cookies(req.URL)
if len(cookies) > 0 {
diff --git a/vendor/github.com/google/pprof/profile/profile.go b/vendor/github.com/google/pprof/profile/profile.go
index 0983656c20..f47a243903 100644
--- a/vendor/github.com/google/pprof/profile/profile.go
+++ b/vendor/github.com/google/pprof/profile/profile.go
@@ -849,7 +849,7 @@ func (p *Profile) HasFileLines() bool {
// Unsymbolizable returns true if a mapping points to a binary for which
// locations can't be symbolized in principle, at least now. Examples are
-// "[vdso]", [vsyscall]" and some others, see the code.
+// "[vdso]", "[vsyscall]" and some others, see the code.
func (m *Mapping) Unsymbolizable() bool {
name := filepath.Base(m.File)
return strings.HasPrefix(name, "[") || strings.HasPrefix(name, "linux-vdso") || strings.HasPrefix(m.File, "/dev/dri/") || m.File == "//anon"
diff --git a/vendor/github.com/pion/ice/v2/agent.go b/vendor/github.com/pion/ice/v2/agent.go
index 82ee75bc38..c2718fc67d 100644
--- a/vendor/github.com/pion/ice/v2/agent.go
+++ b/vendor/github.com/pion/ice/v2/agent.go
@@ -1055,16 +1055,16 @@ func (a *Agent) invalidatePendingBindingRequests(filterTime time.Time) {
// Assert that the passed TransactionID is in our pendingBindingRequests and returns the destination
// If the bindingRequest was valid remove it from our pending cache
-func (a *Agent) handleInboundBindingSuccess(id [stun.TransactionIDSize]byte) (bool, *bindingRequest) {
+func (a *Agent) handleInboundBindingSuccess(id [stun.TransactionIDSize]byte) (bool, *bindingRequest, time.Duration) {
a.invalidatePendingBindingRequests(time.Now())
for i := range a.pendingBindingRequests {
if a.pendingBindingRequests[i].transactionID == id {
validBindingRequest := a.pendingBindingRequests[i]
a.pendingBindingRequests = append(a.pendingBindingRequests[:i], a.pendingBindingRequests[i+1:]...)
- return true, &validBindingRequest
+ return true, &validBindingRequest, time.Since(validBindingRequest.timestamp)
}
}
- return false, nil
+ return false, nil, 0
}
// handleInbound processes STUN traffic from a remote candidate
diff --git a/vendor/github.com/pion/ice/v2/agent_stats.go b/vendor/github.com/pion/ice/v2/agent_stats.go
index b9ad7187e0..4366beeb08 100644
--- a/vendor/github.com/pion/ice/v2/agent_stats.go
+++ b/vendor/github.com/pion/ice/v2/agent_stats.go
@@ -29,14 +29,14 @@ func (a *Agent) GetCandidatePairsStats() []CandidatePairStats {
// FirstRequestTimestamp time.Time
// LastRequestTimestamp time.Time
// LastResponseTimestamp time.Time
- // TotalRoundTripTime float64
- // CurrentRoundTripTime float64
+ TotalRoundTripTime: cp.TotalRoundTripTime(),
+ CurrentRoundTripTime: cp.CurrentRoundTripTime(),
// AvailableOutgoingBitrate float64
// AvailableIncomingBitrate float64
// CircuitBreakerTriggerCount uint32
// RequestsReceived uint64
// RequestsSent uint64
- // ResponsesReceived uint64
+ ResponsesReceived: cp.ResponsesReceived(),
// ResponsesSent uint64
// RetransmissionsReceived uint64
// RetransmissionsSent uint64
diff --git a/vendor/github.com/pion/ice/v2/candidate_relay.go b/vendor/github.com/pion/ice/v2/candidate_relay.go
index 449d077a69..fa5297b25a 100644
--- a/vendor/github.com/pion/ice/v2/candidate_relay.go
+++ b/vendor/github.com/pion/ice/v2/candidate_relay.go
@@ -70,6 +70,23 @@ func NewCandidateRelay(config *CandidateRelayConfig) (*CandidateRelay, error) {
}, nil
}
+// LocalPreference returns the local preference for this candidate
+func (c *CandidateRelay) LocalPreference() uint16 {
+ // These preference values come from libwebrtc
+ // https://github.com/mozilla/libwebrtc/blob/1389c76d9c79839a2ca069df1db48aa3f2e6a1ac/p2p/base/turn_port.cc#L61
+ var relayPreference uint16
+ switch c.relayProtocol {
+ case relayProtocolTLS, relayProtocolDTLS:
+ relayPreference = 2
+ case tcp:
+ relayPreference = 1
+ default:
+ relayPreference = 0
+ }
+
+ return c.candidateBase.LocalPreference() + relayPreference
+}
+
// RelayProtocol returns the protocol used between the endpoint and the relay server.
func (c *CandidateRelay) RelayProtocol() string {
return c.relayProtocol
diff --git a/vendor/github.com/pion/ice/v2/candidatepair.go b/vendor/github.com/pion/ice/v2/candidatepair.go
index 34ec047076..38f8ccb933 100644
--- a/vendor/github.com/pion/ice/v2/candidatepair.go
+++ b/vendor/github.com/pion/ice/v2/candidatepair.go
@@ -5,6 +5,8 @@ package ice
import (
"fmt"
+ "sync/atomic"
+ "time"
"github.com/pion/stun"
)
@@ -28,6 +30,11 @@ type CandidatePair struct {
state CandidatePairState
nominated bool
nominateOnBindingSuccess bool
+
+ // stats
+ currentRoundTripTime int64 // in ns
+ totalRoundTripTime int64 // in ns
+ responsesReceived uint64
}
func (p *CandidatePair) String() string {
@@ -100,3 +107,30 @@ func (a *Agent) sendSTUN(msg *stun.Message, local, remote Candidate) {
a.log.Tracef("Failed to send STUN message: %s", err)
}
}
+
+// UpdateRoundTripTime sets the current round time of this pair and
+// accumulates total round trip time and responses received
+func (p *CandidatePair) UpdateRoundTripTime(rtt time.Duration) {
+ rttNs := rtt.Nanoseconds()
+ atomic.StoreInt64(&p.currentRoundTripTime, rttNs)
+ atomic.AddInt64(&p.totalRoundTripTime, rttNs)
+ atomic.AddUint64(&p.responsesReceived, 1)
+}
+
+// CurrentRoundTripTime returns the current round trip time in seconds
+// https://www.w3.org/TR/webrtc-stats/#dom-rtcicecandidatepairstats-currentroundtriptime
+func (p *CandidatePair) CurrentRoundTripTime() float64 {
+ return time.Duration(atomic.LoadInt64(&p.currentRoundTripTime)).Seconds()
+}
+
+// TotalRoundTripTime returns the current round trip time in seconds
+// https://www.w3.org/TR/webrtc-stats/#dom-rtcicecandidatepairstats-totalroundtriptime
+func (p *CandidatePair) TotalRoundTripTime() float64 {
+ return time.Duration(atomic.LoadInt64(&p.totalRoundTripTime)).Seconds()
+}
+
+// ResponsesReceived returns the total number of connectivity responses received
+// https://www.w3.org/TR/webrtc-stats/#dom-rtcicecandidatepairstats-responsesreceived
+func (p *CandidatePair) ResponsesReceived() uint64 {
+ return atomic.LoadUint64(&p.responsesReceived)
+}
diff --git a/vendor/github.com/pion/ice/v2/gather.go b/vendor/github.com/pion/ice/v2/gather.go
index f93e6c16aa..3ca8086e79 100644
--- a/vendor/github.com/pion/ice/v2/gather.go
+++ b/vendor/github.com/pion/ice/v2/gather.go
@@ -400,7 +400,7 @@ func (a *Agent) gatherCandidatesSrflxUDPMux(ctx context.Context, urls []*stun.UR
hostPort := fmt.Sprintf("%s:%d", url.Host, url.Port)
serverAddr, err := a.net.ResolveUDPAddr(network, hostPort)
if err != nil {
- a.log.Debugf("Failed to resolve STUN host: %s: %v", hostPort, err)
+ a.log.Debugf("Failed to resolve STUN host: %s %s: %v", network, hostPort, err)
return
}
@@ -462,7 +462,7 @@ func (a *Agent) gatherCandidatesSrflx(ctx context.Context, urls []*stun.URI, net
hostPort := fmt.Sprintf("%s:%d", url.Host, url.Port)
serverAddr, err := a.net.ResolveUDPAddr(network, hostPort)
if err != nil {
- a.log.Debugf("Failed to resolve STUN host: %s: %v", hostPort, err)
+ a.log.Debugf("Failed to resolve STUN host: %s %s: %v", network, hostPort, err)
return
}
@@ -616,7 +616,7 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*stun.URI) { /
relAddr = conn.LocalAddr().(*net.UDPAddr).IP.String() //nolint:forcetypeassert
relPort = conn.LocalAddr().(*net.UDPAddr).Port //nolint:forcetypeassert
- relayProtocol = "dtls"
+ relayProtocol = relayProtocolDTLS
locConn = &fakenet.PacketConn{Conn: conn}
case url.Proto == stun.ProtoTypeTCP && url.Scheme == stun.SchemeTypeTURNS:
tcpAddr, resolvErr := a.net.ResolveTCPAddr(NetworkTypeTCP4.String(), turnServerAddr)
@@ -646,7 +646,7 @@ func (a *Agent) gatherCandidatesRelay(ctx context.Context, urls []*stun.URI) { /
relAddr = conn.LocalAddr().(*net.TCPAddr).IP.String() //nolint:forcetypeassert
relPort = conn.LocalAddr().(*net.TCPAddr).Port //nolint:forcetypeassert
- relayProtocol = "tls"
+ relayProtocol = relayProtocolTLS
locConn = turn.NewSTUNConn(conn)
default:
a.log.Warnf("Unable to handle URL in gatherCandidatesRelay %v", url)
diff --git a/vendor/github.com/pion/ice/v2/ice.go b/vendor/github.com/pion/ice/v2/ice.go
index bd551206e6..73262dd32f 100644
--- a/vendor/github.com/pion/ice/v2/ice.go
+++ b/vendor/github.com/pion/ice/v2/ice.go
@@ -83,3 +83,8 @@ func (t GatheringState) String() string {
return ErrUnknownType.Error()
}
}
+
+const (
+ relayProtocolDTLS = "dtls"
+ relayProtocolTLS = "tls"
+)
diff --git a/vendor/github.com/pion/ice/v2/selection.go b/vendor/github.com/pion/ice/v2/selection.go
index 69bde40ac6..538eb0fff1 100644
--- a/vendor/github.com/pion/ice/v2/selection.go
+++ b/vendor/github.com/pion/ice/v2/selection.go
@@ -120,7 +120,7 @@ func (s *controllingSelector) HandleBindingRequest(m *stun.Message, local, remot
}
func (s *controllingSelector) HandleSuccessResponse(m *stun.Message, local, remote Candidate, remoteAddr net.Addr) {
- ok, pendingRequest := s.agent.handleInboundBindingSuccess(m.TransactionID)
+ ok, pendingRequest, rtt := s.agent.handleInboundBindingSuccess(m.TransactionID)
if !ok {
s.log.Warnf("Discard message from (%s), unknown TransactionID 0x%x", remote, m.TransactionID)
return
@@ -149,6 +149,8 @@ func (s *controllingSelector) HandleSuccessResponse(m *stun.Message, local, remo
if pendingRequest.isUseCandidate && s.agent.getSelectedPair() == nil {
s.agent.setSelectedPair(p)
}
+
+ p.UpdateRoundTripTime(rtt)
}
func (s *controllingSelector) PingCandidate(local, remote Candidate) {
@@ -211,7 +213,7 @@ func (s *controlledSelector) HandleSuccessResponse(m *stun.Message, local, remot
// request with an appropriate error code response (e.g., 400)
// [RFC5389].
- ok, pendingRequest := s.agent.handleInboundBindingSuccess(m.TransactionID)
+ ok, pendingRequest, rtt := s.agent.handleInboundBindingSuccess(m.TransactionID)
if !ok {
s.log.Warnf("Discard message from (%s), unknown TransactionID 0x%x", remote, m.TransactionID)
return
@@ -245,6 +247,8 @@ func (s *controlledSelector) HandleSuccessResponse(m *stun.Message, local, remot
s.log.Tracef("Ignore nominate new pair %s, already nominated pair %s", p, selectedPair)
}
}
+
+ p.UpdateRoundTripTime(rtt)
}
func (s *controlledSelector) HandleBindingRequest(m *stun.Message, local, remote Candidate) {
diff --git a/vendor/github.com/pion/webrtc/v3/errors.go b/vendor/github.com/pion/webrtc/v3/errors.go
index 009e91dd68..8c460d1444 100644
--- a/vendor/github.com/pion/webrtc/v3/errors.go
+++ b/vendor/github.com/pion/webrtc/v3/errors.go
@@ -240,6 +240,7 @@ var (
errInvalidICEServer = errors.New("invalid ICEServer")
errICETransportNotInNew = errors.New("ICETransport can only be called in ICETransportStateNew")
+ errICETransportClosed = errors.New("ICETransport closed")
errCertificatePEMFormatError = errors.New("bad Certificate PEM format")
diff --git a/vendor/github.com/pion/webrtc/v3/icetransport.go b/vendor/github.com/pion/webrtc/v3/icetransport.go
index cb9aa22de8..01bbc67c39 100644
--- a/vendor/github.com/pion/webrtc/v3/icetransport.go
+++ b/vendor/github.com/pion/webrtc/v3/icetransport.go
@@ -67,7 +67,7 @@ func (t *ICETransport) GetSelectedCandidatePair() (*ICECandidatePair, error) {
return nil, err
}
- return &ICECandidatePair{Local: &local, Remote: &remote}, nil
+ return NewICECandidatePair(&local, &remote), nil
}
// NewICETransport creates a new NewICETransport.
@@ -157,6 +157,10 @@ func (t *ICETransport) Start(gatherer *ICEGatherer, params ICEParameters, role *
return err
}
+ if t.State() == ICETransportStateClosed {
+ return errICETransportClosed
+ }
+
t.conn = iceConn
config := mux.Config{
@@ -200,28 +204,31 @@ func (t *ICETransport) GracefulStop() error {
func (t *ICETransport) stop(shouldGracefullyClose bool) error {
t.lock.Lock()
- defer t.lock.Unlock()
-
t.setState(ICETransportStateClosed)
if t.ctxCancel != nil {
t.ctxCancel()
}
+ // mux and gatherer can only be set when ICETransport.State != Closed.
+ mux := t.mux
+ gatherer := t.gatherer
+ t.lock.Unlock()
+
if t.mux != nil {
var closeErrs []error
- if shouldGracefullyClose && t.gatherer != nil {
+ if shouldGracefullyClose && gatherer != nil {
// we can't access icegatherer/icetransport.Close via
// mux's net.Conn Close so we call it earlier here.
- closeErrs = append(closeErrs, t.gatherer.GracefulClose())
+ closeErrs = append(closeErrs, gatherer.GracefulClose())
}
- closeErrs = append(closeErrs, t.mux.Close())
+ closeErrs = append(closeErrs, mux.Close())
return util.FlattenErrs(closeErrs)
- } else if t.gatherer != nil {
+ } else if gatherer != nil {
if shouldGracefullyClose {
- return t.gatherer.GracefulClose()
+ return gatherer.GracefulClose()
}
- return t.gatherer.Close()
+ return gatherer.Close()
}
return nil
}
diff --git a/vendor/github.com/pion/webrtc/v3/peerconnection.go b/vendor/github.com/pion/webrtc/v3/peerconnection.go
index 3b40dafecb..d515c08a7b 100644
--- a/vendor/github.com/pion/webrtc/v3/peerconnection.go
+++ b/vendor/github.com/pion/webrtc/v3/peerconnection.go
@@ -56,8 +56,9 @@ type PeerConnection struct {
idpLoginURL *string
isClosed *atomicBool
- isGracefulClosed *atomicBool
- isGracefulClosedDone chan struct{}
+ isGracefullyClosingOrClosed bool
+ isCloseDone chan struct{}
+ isGracefulCloseDone chan struct{}
isNegotiationNeeded *atomicBool
updateNegotiationNeededFlagOnEmptyChain *atomicBool
@@ -130,8 +131,8 @@ func (api *API) NewPeerConnection(configuration Configuration) (*PeerConnection,
ICECandidatePoolSize: 0,
},
isClosed: &atomicBool{},
- isGracefulClosed: &atomicBool{},
- isGracefulClosedDone: make(chan struct{}),
+ isCloseDone: make(chan struct{}),
+ isGracefulCloseDone: make(chan struct{}),
isNegotiationNeeded: &atomicBool{},
updateNegotiationNeededFlagOnEmptyChain: &atomicBool{},
lastOffer: "",
@@ -1117,10 +1118,18 @@ func (pc *PeerConnection) SetRemoteDescription(desc SessionDescription) error {
case direction == RTPTransceiverDirectionRecvonly:
if t.Direction() == RTPTransceiverDirectionSendrecv {
t.setDirection(RTPTransceiverDirectionSendonly)
+ } else if t.Direction() == RTPTransceiverDirectionRecvonly {
+ t.setDirection(RTPTransceiverDirectionInactive)
}
case direction == RTPTransceiverDirectionSendrecv:
if t.Direction() == RTPTransceiverDirectionSendonly {
t.setDirection(RTPTransceiverDirectionSendrecv)
+ } else if t.Direction() == RTPTransceiverDirectionInactive {
+ t.setDirection(RTPTransceiverDirectionRecvonly)
+ }
+ case direction == RTPTransceiverDirectionSendonly:
+ if t.Direction() == RTPTransceiverDirectionInactive {
+ t.setDirection(RTPTransceiverDirectionRecvonly)
}
}
@@ -1287,7 +1296,7 @@ func setRTPTransceiverCurrentDirection(answer *SessionDescription, currentTransc
// If a transceiver is created by applying a remote description that has recvonly transceiver,
// it will have no sender. In this case, the transceiver's current direction is set to inactive so
// that the transceiver can be reused by next AddTrack.
- if direction == RTPTransceiverDirectionSendonly && t.Sender() == nil {
+ if !weOffer && direction == RTPTransceiverDirectionSendonly && t.Sender() == nil {
direction = RTPTransceiverDirectionInactive
}
@@ -1339,8 +1348,8 @@ func (pc *PeerConnection) configureRTPReceivers(isRenegotiation bool, remoteDesc
mid := t.Mid()
receiverNeedsStopped := false
- func() {
- for _, t := range tracks {
+ for _, track := range tracks {
+ func(t *TrackRemote) {
t.mu.Lock()
defer t.mu.Unlock()
@@ -1348,19 +1357,19 @@ func (pc *PeerConnection) configureRTPReceivers(isRenegotiation bool, remoteDesc
if details := trackDetailsForRID(incomingTracks, mid, t.rid); details != nil {
t.id = details.id
t.streamID = details.streamID
- continue
+ return
}
} else if t.ssrc != 0 {
if details := trackDetailsForSSRC(incomingTracks, t.ssrc); details != nil {
t.id = details.id
t.streamID = details.streamID
- continue
+ return
}
}
receiverNeedsStopped = true
- }
- }()
+ }(track)
+ }
if !receiverNeedsStopped {
continue
@@ -2101,22 +2110,44 @@ func (pc *PeerConnection) GracefulClose() error {
func (pc *PeerConnection) close(shouldGracefullyClose bool) error {
// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #1)
// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #2)
- alreadyGracefullyClosed := shouldGracefullyClose && pc.isGracefulClosed.swap(true)
- if pc.isClosed.swap(true) {
- if alreadyGracefullyClosed {
- // similar but distinct condition where we may be waiting for some
- // other graceful close to finish. Incorrectly using isClosed may
- // leak a goroutine.
- <-pc.isGracefulClosedDone
- }
- return nil
+
+ pc.mu.Lock()
+ // A lock in this critical section is needed because pc.isClosed and
+ // pc.isGracefullyClosingOrClosed are related to each other in that we
+ // want to make graceful and normal closure one time operations in order
+ // to avoid any double closure errors from cropping up. However, there are
+ // some overlapping close cases when both normal and graceful close are used
+ // that should be idempotent, but be cautioned when writing new close behavior
+ // to preserve this property.
+ isAlreadyClosingOrClosed := pc.isClosed.swap(true)
+ isAlreadyGracefullyClosingOrClosed := pc.isGracefullyClosingOrClosed
+ if shouldGracefullyClose && !isAlreadyGracefullyClosingOrClosed {
+ pc.isGracefullyClosingOrClosed = true
}
- if shouldGracefullyClose && !alreadyGracefullyClosed {
- defer close(pc.isGracefulClosedDone)
+ pc.mu.Unlock()
+
+ if isAlreadyClosingOrClosed {
+ if !shouldGracefullyClose {
+ return nil
+ }
+ // Even if we're already closing, it may not be graceful:
+ // If we are not the ones doing the closing, we just wait for the graceful close
+ // to happen and then return.
+ if isAlreadyGracefullyClosingOrClosed {
+ <-pc.isGracefulCloseDone
+ return nil
+ }
+ // Otherwise we need to go through the graceful closure flow once the
+ // normal closure is done since there are extra steps to take with a
+ // graceful close.
+ <-pc.isCloseDone
+ } else {
+ defer close(pc.isCloseDone)
}
- // https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #3)
- pc.signalingState.Set(SignalingStateClosed)
+ if shouldGracefullyClose {
+ defer close(pc.isGracefulCloseDone)
+ }
// Try closing everything and collect the errors
// Shutdown strategy:
@@ -2126,6 +2157,34 @@ func (pc *PeerConnection) close(shouldGracefullyClose bool) error {
// continue the chain the Mux has to be closed.
closeErrs := make([]error, 4)
+ doGracefulCloseOps := func() []error {
+ if !shouldGracefullyClose {
+ return nil
+ }
+
+ // these are all non-canon steps
+ var gracefulCloseErrors []error
+ if pc.iceTransport != nil {
+ gracefulCloseErrors = append(gracefulCloseErrors, pc.iceTransport.GracefulStop())
+ }
+
+ pc.ops.GracefulClose()
+
+ pc.sctpTransport.lock.Lock()
+ for _, d := range pc.sctpTransport.dataChannels {
+ gracefulCloseErrors = append(gracefulCloseErrors, d.GracefulClose())
+ }
+ pc.sctpTransport.lock.Unlock()
+ return gracefulCloseErrors
+ }
+
+ if isAlreadyClosingOrClosed {
+ return util.FlattenErrs(doGracefulCloseOps())
+ }
+
+ // https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #3)
+ pc.signalingState.Set(SignalingStateClosed)
+
closeErrs = append(closeErrs, pc.api.interceptor.Close())
// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #4)
@@ -2156,28 +2215,15 @@ func (pc *PeerConnection) close(shouldGracefullyClose bool) error {
closeErrs = append(closeErrs, pc.dtlsTransport.Stop())
// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #8, #9, #10)
- if pc.iceTransport != nil {
- if shouldGracefullyClose {
- // note that it isn't canon to stop gracefully
- closeErrs = append(closeErrs, pc.iceTransport.GracefulStop())
- } else {
- closeErrs = append(closeErrs, pc.iceTransport.Stop())
- }
+ if pc.iceTransport != nil && !shouldGracefullyClose {
+ // we will stop gracefully in doGracefulCloseOps
+ closeErrs = append(closeErrs, pc.iceTransport.Stop())
}
// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-close (step #11)
pc.updateConnectionState(pc.ICEConnectionState(), pc.dtlsTransport.State())
- if shouldGracefullyClose {
- pc.ops.GracefulClose()
-
- // note that it isn't canon to stop gracefully
- pc.sctpTransport.lock.Lock()
- for _, d := range pc.sctpTransport.dataChannels {
- closeErrs = append(closeErrs, d.GracefulClose())
- }
- pc.sctpTransport.lock.Unlock()
- }
+ closeErrs = append(closeErrs, doGracefulCloseOps()...)
return util.FlattenErrs(closeErrs)
}
diff --git a/vendor/github.com/prometheus/client_golang/prometheus/histogram.go b/vendor/github.com/prometheus/client_golang/prometheus/histogram.go
index 8a4f49a4c5..519db348a7 100644
--- a/vendor/github.com/prometheus/client_golang/prometheus/histogram.go
+++ b/vendor/github.com/prometheus/client_golang/prometheus/histogram.go
@@ -844,9 +844,7 @@ func (h *histogram) Write(out *dto.Metric) error {
}}
}
- // If exemplars are not configured, the cap will be 0.
- // So append is not needed in this case.
- if cap(h.nativeExemplars.exemplars) > 0 {
+ if h.nativeExemplars.isEnabled() {
h.nativeExemplars.Lock()
his.Exemplars = append(his.Exemplars, h.nativeExemplars.exemplars...)
h.nativeExemplars.Unlock()
@@ -1665,6 +1663,10 @@ type nativeExemplars struct {
exemplars []*dto.Exemplar
}
+func (n *nativeExemplars) isEnabled() bool {
+ return n.ttl != -1
+}
+
func makeNativeExemplars(ttl time.Duration, maxCount int) nativeExemplars {
if ttl == 0 {
ttl = 5 * time.Minute
@@ -1686,7 +1688,7 @@ func makeNativeExemplars(ttl time.Duration, maxCount int) nativeExemplars {
}
func (n *nativeExemplars) addExemplar(e *dto.Exemplar) {
- if n.ttl == -1 {
+ if !n.isEnabled() {
return
}
diff --git a/vendor/go.opentelemetry.io/otel/.golangci.yml b/vendor/go.opentelemetry.io/otel/.golangci.yml
index d9abe194d9..a5f904197f 100644
--- a/vendor/go.opentelemetry.io/otel/.golangci.yml
+++ b/vendor/go.opentelemetry.io/otel/.golangci.yml
@@ -64,12 +64,12 @@ issues:
- path: _test\.go
linters:
- gosec
- # Igonoring gosec G404: Use of weak random number generator (math/rand instead of crypto/rand)
+ # Ignoring gosec G404: Use of weak random number generator (math/rand instead of crypto/rand)
# as we commonly use it in tests and examples.
- text: "G404:"
linters:
- gosec
- # Igonoring gosec G402: TLS MinVersion too low
+ # Ignoring gosec G402: TLS MinVersion too low
# as the https://pkg.go.dev/crypto/tls#Config handles MinVersion default well.
- text: "G402: TLS MinVersion too low."
linters:
diff --git a/vendor/go.opentelemetry.io/otel/CHANGELOG.md b/vendor/go.opentelemetry.io/otel/CHANGELOG.md
index 6107c17b89..fb107426e7 100644
--- a/vendor/go.opentelemetry.io/otel/CHANGELOG.md
+++ b/vendor/go.opentelemetry.io/otel/CHANGELOG.md
@@ -11,6 +11,25 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
+## [1.30.0/0.52.0/0.6.0/0.0.9] 2024-09-09
+
+### Added
+
+- Support `OTEL_EXPORTER_OTLP_LOGS_INSECURE` and `OTEL_EXPORTER_OTLP_INSECURE` environments in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc`. (#5739)
+- The `WithResource` option for `NewMeterProvider` now merges the provided resources with the ones from environment variables. (#5773)
+- The `WithResource` option for `NewLoggerProvider` now merges the provided resources with the ones from environment variables. (#5773)
+- Add UTF-8 support to `go.opentelemetry.io/otel/exporters/prometheus`. (#5755)
+
+### Fixed
+
+- Fix memory leak in the global `MeterProvider` when identical instruments are repeatedly created. (#5754)
+- Fix panic on instruments creation when setting meter provider. (#5758)
+- Fix an issue where `SetMeterProvider` in `go.opentelemetry.io/otel` might miss the delegation for instruments and registries. (#5780)
+
+### Removed
+
+- Drop support for [Go 1.21]. (#5736, #5740, #5800)
+
## [1.29.0/0.51.0/0.5.0] 2024-08-23
This release is the last to support [Go 1.21].
@@ -1895,7 +1914,7 @@ with major version 0.
- Setting error status while recording error with Span from oteltest package. (#1729)
- The concept of a remote and local Span stored in a context is unified to just the current Span.
Because of this `"go.opentelemetry.io/otel/trace".RemoteSpanContextFromContext` is removed as it is no longer needed.
- Instead, `"go.opentelemetry.io/otel/trace".SpanContextFromContex` can be used to return the current Span.
+ Instead, `"go.opentelemetry.io/otel/trace".SpanContextFromContext` can be used to return the current Span.
If needed, that Span's `SpanContext.IsRemote()` can then be used to determine if it is remote or not. (#1731)
- The `HasRemoteParent` field of the `"go.opentelemetry.io/otel/sdk/trace".SamplingParameters` is removed.
This field is redundant to the information returned from the `Remote` method of the `SpanContext` held in the `ParentContext` field. (#1749)
@@ -2469,7 +2488,7 @@ This release migrates the default OpenTelemetry SDK into its own Go module, deco
- Prometheus exporter will not apply stale updates or forget inactive metrics. (#903)
- Add test for api.standard `HTTPClientAttributesFromHTTPRequest`. (#905)
- Bump github.com/golangci/golangci-lint from 1.27.0 to 1.28.1 in /tools. (#901, #913)
-- Update otel-colector example to use the v0.5.0 collector. (#915)
+- Update otel-collector example to use the v0.5.0 collector. (#915)
- The `grpctrace` instrumentation uses a span name conforming to the OpenTelemetry semantic conventions (does not contain a leading slash (`/`)). (#922)
- The `grpctrace` instrumentation includes an `rpc.method` attribute now set to the gRPC method name. (#900, #922)
- The `grpctrace` instrumentation `rpc.service` attribute now contains the package name if one exists.
@@ -3062,7 +3081,8 @@ It contains api and sdk for trace and meter.
- CircleCI build CI manifest files.
- CODEOWNERS file to track owners of this project.
-[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.29.0...HEAD
+[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.30.0...HEAD
+[1.30.0/0.52.0/0.6.0/0.0.9]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.30.0
[1.29.0/0.51.0/0.5.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.29.0
[1.28.0/0.50.0/0.4.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.28.0
[1.27.0/0.49.0/0.3.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.27.0
diff --git a/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md b/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
index b7402576f9..9158072535 100644
--- a/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
+++ b/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
@@ -578,7 +578,10 @@ See also:
The tests should never leak goroutines.
Use the term `ConcurrentSafe` in the test name when it aims to verify the
-absence of race conditions.
+absence of race conditions. The top-level tests with this term will be run
+many times in the `test-concurrent-safe` CI job to increase the chance of
+catching concurrency issues. This does not apply to subtests when this term
+is not in their root name.
### Internal packages
diff --git a/vendor/go.opentelemetry.io/otel/Makefile b/vendor/go.opentelemetry.io/otel/Makefile
index 070b1e57df..b04695b242 100644
--- a/vendor/go.opentelemetry.io/otel/Makefile
+++ b/vendor/go.opentelemetry.io/otel/Makefile
@@ -145,12 +145,14 @@ build-tests/%:
# Tests
-TEST_TARGETS := test-default test-bench test-short test-verbose test-race
+TEST_TARGETS := test-default test-bench test-short test-verbose test-race test-concurrent-safe
.PHONY: $(TEST_TARGETS) test
test-default test-race: ARGS=-race
test-bench: ARGS=-run=xxxxxMatchNothingxxxxx -test.benchtime=1ms -bench=.
test-short: ARGS=-short
test-verbose: ARGS=-v -race
+test-concurrent-safe: ARGS=-run=ConcurrentSafe -count=100 -race
+test-concurrent-safe: TIMEOUT=120
$(TEST_TARGETS): test
test: $(OTEL_GO_MOD_DIRS:%=test/%)
test/%: DIR=$*
diff --git a/vendor/go.opentelemetry.io/otel/README.md b/vendor/go.opentelemetry.io/otel/README.md
index 657df34710..9a65707038 100644
--- a/vendor/go.opentelemetry.io/otel/README.md
+++ b/vendor/go.opentelemetry.io/otel/README.md
@@ -51,25 +51,18 @@ Currently, this project supports the following environments.
|----------|------------|--------------|
| Ubuntu | 1.23 | amd64 |
| Ubuntu | 1.22 | amd64 |
-| Ubuntu | 1.21 | amd64 |
| Ubuntu | 1.23 | 386 |
| Ubuntu | 1.22 | 386 |
-| Ubuntu | 1.21 | 386 |
| Linux | 1.23 | arm64 |
| Linux | 1.22 | arm64 |
-| Linux | 1.21 | arm64 |
| macOS 13 | 1.23 | amd64 |
| macOS 13 | 1.22 | amd64 |
-| macOS 13 | 1.21 | amd64 |
| macOS | 1.23 | arm64 |
| macOS | 1.22 | arm64 |
-| macOS | 1.21 | arm64 |
| Windows | 1.23 | amd64 |
| Windows | 1.22 | amd64 |
-| Windows | 1.21 | amd64 |
| Windows | 1.23 | 386 |
| Windows | 1.22 | 386 |
-| Windows | 1.21 | 386 |
While this project should work for other systems, no compatibility guarantees
are made for those systems currently.
diff --git a/vendor/go.opentelemetry.io/otel/baggage/baggage.go b/vendor/go.opentelemetry.io/otel/baggage/baggage.go
index b3569e95e5..36f5367030 100644
--- a/vendor/go.opentelemetry.io/otel/baggage/baggage.go
+++ b/vendor/go.opentelemetry.io/otel/baggage/baggage.go
@@ -50,7 +50,7 @@ type Property struct {
// component boundaries may impose their own restrictions on Property key.
// For example, the W3C Baggage specification restricts the Property keys to strings that
// satisfy the token definition from RFC7230, Section 3.2.6.
-// For maximum compatibility, alpha-numeric value are strongly recommended to be used as Property key.
+// For maximum compatibility, alphanumeric value are strongly recommended to be used as Property key.
func NewKeyProperty(key string) (Property, error) {
if !validateBaggageName(key) {
return newInvalidProperty(), fmt.Errorf("%w: %q", errInvalidKey, key)
@@ -90,7 +90,7 @@ func NewKeyValueProperty(key, value string) (Property, error) {
// component boundaries may impose their own restrictions on Property key.
// For example, the W3C Baggage specification restricts the Property keys to strings that
// satisfy the token definition from RFC7230, Section 3.2.6.
-// For maximum compatibility, alpha-numeric value are strongly recommended to be used as Property key.
+// For maximum compatibility, alphanumeric value are strongly recommended to be used as Property key.
func NewKeyValuePropertyRaw(key, value string) (Property, error) {
if !validateBaggageName(key) {
return newInvalidProperty(), fmt.Errorf("%w: %q", errInvalidKey, key)
@@ -287,7 +287,7 @@ func NewMember(key, value string, props ...Property) (Member, error) {
// component boundaries may impose their own restrictions on baggage key.
// For example, the W3C Baggage specification restricts the baggage keys to strings that
// satisfy the token definition from RFC7230, Section 3.2.6.
-// For maximum compatibility, alpha-numeric value are strongly recommended to be used as baggage key.
+// For maximum compatibility, alphanumeric value are strongly recommended to be used as baggage key.
func NewMemberRaw(key, value string, props ...Property) (Member, error) {
m := Member{
key: key,
diff --git a/vendor/go.opentelemetry.io/otel/internal/global/meter.go b/vendor/go.opentelemetry.io/otel/internal/global/meter.go
index cfd1df9bfa..f2fc3929b1 100644
--- a/vendor/go.opentelemetry.io/otel/internal/global/meter.go
+++ b/vendor/go.opentelemetry.io/otel/internal/global/meter.go
@@ -5,8 +5,8 @@ package global // import "go.opentelemetry.io/otel/internal/global"
import (
"container/list"
+ "reflect"
"sync"
- "sync/atomic"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/metric/embedded"
@@ -76,7 +76,7 @@ func (p *meterProvider) Meter(name string, opts ...metric.MeterOption) metric.Me
return val
}
- t := &meter{name: name, opts: opts}
+ t := &meter{name: name, opts: opts, instruments: make(map[instID]delegatedInstrument)}
p.meters[key] = t
return t
}
@@ -92,17 +92,29 @@ type meter struct {
opts []metric.MeterOption
mtx sync.Mutex
- instruments []delegatedInstrument
+ instruments map[instID]delegatedInstrument
registry list.List
- delegate atomic.Value // metric.Meter
+ delegate metric.Meter
}
type delegatedInstrument interface {
setDelegate(metric.Meter)
}
+// instID are the identifying properties of a instrument.
+type instID struct {
+ // name is the name of the stream.
+ name string
+ // description is the description of the stream.
+ description string
+ // kind defines the functional group of the instrument.
+ kind reflect.Type
+ // unit is the unit of the stream.
+ unit string
+}
+
// setDelegate configures m to delegate all Meter functionality to Meters
// created by provider.
//
@@ -110,12 +122,12 @@ type delegatedInstrument interface {
//
// It is guaranteed by the caller that this happens only once.
func (m *meter) setDelegate(provider metric.MeterProvider) {
- meter := provider.Meter(m.name, m.opts...)
- m.delegate.Store(meter)
-
m.mtx.Lock()
defer m.mtx.Unlock()
+ meter := provider.Meter(m.name, m.opts...)
+ m.delegate = meter
+
for _, inst := range m.instruments {
inst.setDelegate(meter)
}
@@ -133,169 +145,295 @@ func (m *meter) setDelegate(provider metric.MeterProvider) {
}
func (m *meter) Int64Counter(name string, options ...metric.Int64CounterOption) (metric.Int64Counter, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Int64Counter(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Int64Counter(name, options...)
+ }
+
i := &siCounter{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewInt64CounterConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Int64UpDownCounter(name string, options ...metric.Int64UpDownCounterOption) (metric.Int64UpDownCounter, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Int64UpDownCounter(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Int64UpDownCounter(name, options...)
+ }
+
i := &siUpDownCounter{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewInt64UpDownCounterConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Int64Histogram(name string, options ...metric.Int64HistogramOption) (metric.Int64Histogram, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Int64Histogram(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Int64Histogram(name, options...)
+ }
+
i := &siHistogram{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewInt64HistogramConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Int64Gauge(name string, options ...metric.Int64GaugeOption) (metric.Int64Gauge, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Int64Gauge(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Int64Gauge(name, options...)
+ }
+
i := &siGauge{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewInt64GaugeConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Int64ObservableCounter(name string, options ...metric.Int64ObservableCounterOption) (metric.Int64ObservableCounter, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Int64ObservableCounter(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Int64ObservableCounter(name, options...)
+ }
+
i := &aiCounter{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewInt64ObservableCounterConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Int64ObservableUpDownCounter(name string, options ...metric.Int64ObservableUpDownCounterOption) (metric.Int64ObservableUpDownCounter, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Int64ObservableUpDownCounter(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Int64ObservableUpDownCounter(name, options...)
+ }
+
i := &aiUpDownCounter{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewInt64ObservableUpDownCounterConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Int64ObservableGauge(name string, options ...metric.Int64ObservableGaugeOption) (metric.Int64ObservableGauge, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Int64ObservableGauge(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Int64ObservableGauge(name, options...)
+ }
+
i := &aiGauge{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewInt64ObservableGaugeConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Float64Counter(name string, options ...metric.Float64CounterOption) (metric.Float64Counter, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Float64Counter(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Float64Counter(name, options...)
+ }
+
i := &sfCounter{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewFloat64CounterConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Float64UpDownCounter(name string, options ...metric.Float64UpDownCounterOption) (metric.Float64UpDownCounter, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Float64UpDownCounter(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Float64UpDownCounter(name, options...)
+ }
+
i := &sfUpDownCounter{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewFloat64UpDownCounterConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Float64Histogram(name string, options ...metric.Float64HistogramOption) (metric.Float64Histogram, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Float64Histogram(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Float64Histogram(name, options...)
+ }
+
i := &sfHistogram{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewFloat64HistogramConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Float64Gauge(name string, options ...metric.Float64GaugeOption) (metric.Float64Gauge, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Float64Gauge(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Float64Gauge(name, options...)
+ }
+
i := &sfGauge{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewFloat64GaugeConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Float64ObservableCounter(name string, options ...metric.Float64ObservableCounterOption) (metric.Float64ObservableCounter, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Float64ObservableCounter(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Float64ObservableCounter(name, options...)
+ }
+
i := &afCounter{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewFloat64ObservableCounterConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Float64ObservableUpDownCounter(name string, options ...metric.Float64ObservableUpDownCounterOption) (metric.Float64ObservableUpDownCounter, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Float64ObservableUpDownCounter(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Float64ObservableUpDownCounter(name, options...)
+ }
+
i := &afUpDownCounter{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewFloat64ObservableUpDownCounterConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
func (m *meter) Float64ObservableGauge(name string, options ...metric.Float64ObservableGaugeOption) (metric.Float64ObservableGauge, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- return del.Float64ObservableGauge(name, options...)
- }
m.mtx.Lock()
defer m.mtx.Unlock()
+
+ if m.delegate != nil {
+ return m.delegate.Float64ObservableGauge(name, options...)
+ }
+
i := &afGauge{name: name, opts: options}
- m.instruments = append(m.instruments, i)
+ cfg := metric.NewFloat64ObservableGaugeConfig(options...)
+ id := instID{
+ name: name,
+ kind: reflect.TypeOf(i),
+ description: cfg.Description(),
+ unit: cfg.Unit(),
+ }
+ m.instruments[id] = i
return i, nil
}
// RegisterCallback captures the function that will be called during Collect.
func (m *meter) RegisterCallback(f metric.Callback, insts ...metric.Observable) (metric.Registration, error) {
- if del, ok := m.delegate.Load().(metric.Meter); ok {
- insts = unwrapInstruments(insts)
- return del.RegisterCallback(f, insts...)
- }
-
m.mtx.Lock()
defer m.mtx.Unlock()
+ if m.delegate != nil {
+ insts = unwrapInstruments(insts)
+ return m.delegate.RegisterCallback(f, insts...)
+ }
+
reg := ®istration{instruments: insts, function: f}
e := m.registry.PushBack(reg)
reg.unreg = func() error {
diff --git a/vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go b/vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go
index cf23db7780..f8435d8f28 100644
--- a/vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go
+++ b/vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go
@@ -213,7 +213,7 @@ type Float64Observer interface {
}
// Float64Callback is a function registered with a Meter that makes
-// observations for a Float64Observerable instrument it is registered with.
+// observations for a Float64Observable instrument it is registered with.
// Calls to the Float64Observer record measurement values for the
// Float64Observable.
//
diff --git a/vendor/go.opentelemetry.io/otel/metric/asyncint64.go b/vendor/go.opentelemetry.io/otel/metric/asyncint64.go
index c82ba5324e..e079aaef16 100644
--- a/vendor/go.opentelemetry.io/otel/metric/asyncint64.go
+++ b/vendor/go.opentelemetry.io/otel/metric/asyncint64.go
@@ -212,7 +212,7 @@ type Int64Observer interface {
}
// Int64Callback is a function registered with a Meter that makes observations
-// for an Int64Observerable instrument it is registered with. Calls to the
+// for an Int64Observable instrument it is registered with. Calls to the
// Int64Observer record measurement values for the Int64Observable.
//
// The function needs to complete in a finite amount of time and the deadline
diff --git a/vendor/go.opentelemetry.io/otel/renovate.json b/vendor/go.opentelemetry.io/otel/renovate.json
index 8c5ac55ca9..4d36b98cf4 100644
--- a/vendor/go.opentelemetry.io/otel/renovate.json
+++ b/vendor/go.opentelemetry.io/otel/renovate.json
@@ -19,6 +19,10 @@
"matchManagers": ["gomod"],
"matchDepTypes": ["indirect"],
"enabled": false
+ },
+ {
+ "matchPackageNames": ["google.golang.org/genproto/googleapis/**"],
+ "groupName": "googleapis"
}
]
}
diff --git a/vendor/go.opentelemetry.io/otel/trace/context.go b/vendor/go.opentelemetry.io/otel/trace/context.go
index 5650a174b4..8c45a7107f 100644
--- a/vendor/go.opentelemetry.io/otel/trace/context.go
+++ b/vendor/go.opentelemetry.io/otel/trace/context.go
@@ -22,7 +22,7 @@ func ContextWithSpanContext(parent context.Context, sc SpanContext) context.Cont
return ContextWithSpan(parent, nonRecordingSpan{sc: sc})
}
-// ContextWithRemoteSpanContext returns a copy of parent with rsc set explicly
+// ContextWithRemoteSpanContext returns a copy of parent with rsc set explicitly
// as a remote SpanContext and as the current Span. The Span implementation
// that wraps rsc is non-recording and performs no operations other than to
// return rsc as the SpanContext from the SpanContext method.
diff --git a/vendor/go.opentelemetry.io/otel/trace/doc.go b/vendor/go.opentelemetry.io/otel/trace/doc.go
index d661c5d100..cdbf41d6d7 100644
--- a/vendor/go.opentelemetry.io/otel/trace/doc.go
+++ b/vendor/go.opentelemetry.io/otel/trace/doc.go
@@ -96,7 +96,7 @@ can embed the API interface directly.
This option is not recommended. It will lead to publishing packages that
contain runtime panics when users update to newer versions of
-[go.opentelemetry.io/otel/trace], which may be done with a trasitive
+[go.opentelemetry.io/otel/trace], which may be done with a transitive
dependency.
Finally, an author can embed another implementation in theirs. The embedded
diff --git a/vendor/go.opentelemetry.io/otel/version.go b/vendor/go.opentelemetry.io/otel/version.go
index f67039ed1f..78b40f3ed2 100644
--- a/vendor/go.opentelemetry.io/otel/version.go
+++ b/vendor/go.opentelemetry.io/otel/version.go
@@ -5,5 +5,5 @@ package otel // import "go.opentelemetry.io/otel"
// Version is the current release version of OpenTelemetry in use.
func Version() string {
- return "1.29.0"
+ return "1.30.0"
}
diff --git a/vendor/go.opentelemetry.io/otel/versions.yaml b/vendor/go.opentelemetry.io/otel/versions.yaml
index 3ba611d713..0c32f4fc46 100644
--- a/vendor/go.opentelemetry.io/otel/versions.yaml
+++ b/vendor/go.opentelemetry.io/otel/versions.yaml
@@ -3,7 +3,7 @@
module-sets:
stable-v1:
- version: v1.29.0
+ version: v1.30.0
modules:
- go.opentelemetry.io/otel
- go.opentelemetry.io/otel/bridge/opencensus
@@ -29,12 +29,12 @@ module-sets:
- go.opentelemetry.io/otel/sdk/metric
- go.opentelemetry.io/otel/trace
experimental-metrics:
- version: v0.51.0
+ version: v0.52.0
modules:
- go.opentelemetry.io/otel/example/prometheus
- go.opentelemetry.io/otel/exporters/prometheus
experimental-logs:
- version: v0.5.0
+ version: v0.6.0
modules:
- go.opentelemetry.io/otel/log
- go.opentelemetry.io/otel/sdk/log
@@ -42,7 +42,7 @@ module-sets:
- go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp
- go.opentelemetry.io/otel/exporters/stdout/stdoutlog
experimental-schema:
- version: v0.0.8
+ version: v0.0.9
modules:
- go.opentelemetry.io/otel/schema
excluded-modules:
diff --git a/vendor/modernc.org/libc/libc_all.go b/vendor/modernc.org/libc/libc_all.go
new file mode 100644
index 0000000000..196b81bca0
--- /dev/null
+++ b/vendor/modernc.org/libc/libc_all.go
@@ -0,0 +1,34 @@
+// Copyright 2024 The Libc Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package libc // import "modernc.org/libc"
+
+import (
+ "unsafe"
+ "sync/atomic"
+
+ "golang.org/x/exp/constraints"
+)
+
+func X__sync_add_and_fetch[T constraints.Integer](t *TLS, p uintptr, v T) T {
+ switch unsafe.Sizeof(v) {
+ case 4:
+ return T(atomic.AddInt32((*int32)(unsafe.Pointer(p)), int32(v)))
+ case 8:
+ return T(atomic.AddInt64((*int64)(unsafe.Pointer(p)), int64(v)))
+ default:
+ panic(todo(""))
+ }
+}
+
+func X__sync_sub_and_fetch[T constraints.Integer](t *TLS, p uintptr, v T) T {
+ switch unsafe.Sizeof(v) {
+ case 4:
+ return T(atomic.AddInt32((*int32)(unsafe.Pointer(p)), -int32(v)))
+ case 8:
+ return T(atomic.AddInt64((*int64)(unsafe.Pointer(p)), -int64(v)))
+ default:
+ panic(todo(""))
+ }
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 860db57eb4..4b294d954c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -26,7 +26,7 @@ github.com/Azure/azure-sdk-for-go/sdk/internal/log
github.com/Azure/azure-sdk-for-go/sdk/internal/poller
github.com/Azure/azure-sdk-for-go/sdk/internal/temporal
github.com/Azure/azure-sdk-for-go/sdk/internal/uuid
-# github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0
+# github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.1
## explicit; go 1.18
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob
@@ -61,8 +61,8 @@ github.com/CortexFoundation/robot/backend
# github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66
## explicit; go 1.16
github.com/CortexFoundation/statik
-# github.com/CortexFoundation/torrentfs v1.0.69-0.20240910113603-b146bae422f6
-## explicit; go 1.23
+# github.com/CortexFoundation/torrentfs v1.0.69-0.20240919133537-42182e03b31a
+## explicit; go 1.23.0
github.com/CortexFoundation/torrentfs
github.com/CortexFoundation/torrentfs/backend
github.com/CortexFoundation/torrentfs/backend/caffe
@@ -88,11 +88,11 @@ github.com/ajwerner/btree/internal/abstract
# github.com/alecthomas/atomic v0.1.0-alpha2
## explicit; go 1.18
github.com/alecthomas/atomic
-# github.com/anacrolix/chansync v0.5.1
+# github.com/anacrolix/chansync v0.6.0
## explicit; go 1.16
github.com/anacrolix/chansync
github.com/anacrolix/chansync/events
-# github.com/anacrolix/dht/v2 v2.21.1
+# github.com/anacrolix/dht/v2 v2.21.2
## explicit; go 1.18
github.com/anacrolix/dht/v2
github.com/anacrolix/dht/v2/bep44
@@ -127,20 +127,18 @@ github.com/anacrolix/missinggo/iter
github.com/anacrolix/missinggo/mime
github.com/anacrolix/missinggo/pproffd
github.com/anacrolix/missinggo/slices
-# github.com/anacrolix/missinggo/perf v1.0.0
-## explicit; go 1.12
-github.com/anacrolix/missinggo/perf
-# github.com/anacrolix/missinggo/v2 v2.7.3
+# github.com/anacrolix/missinggo/v2 v2.7.4
## explicit; go 1.18
github.com/anacrolix/missinggo/v2
github.com/anacrolix/missinggo/v2/bitmap
github.com/anacrolix/missinggo/v2/iter
+github.com/anacrolix/missinggo/v2/perf
github.com/anacrolix/missinggo/v2/pproffd
github.com/anacrolix/missinggo/v2/pubsub
github.com/anacrolix/missinggo/v2/resource
github.com/anacrolix/missinggo/v2/slices
-# github.com/anacrolix/mmsg v1.0.0
-## explicit
+# github.com/anacrolix/mmsg v1.1.1
+## explicit; go 1.23.0
github.com/anacrolix/mmsg
github.com/anacrolix/mmsg/socket
# github.com/anacrolix/multiless v0.3.1-0.20221221005021-2d12701f83f7
@@ -150,10 +148,10 @@ github.com/anacrolix/multiless
## explicit; go 1.18
github.com/anacrolix/stm
github.com/anacrolix/stm/stmutil
-# github.com/anacrolix/sync v0.5.1
+# github.com/anacrolix/sync v0.5.2
## explicit; go 1.13
github.com/anacrolix/sync
-# github.com/anacrolix/torrent v1.56.2-0.20240909105636-b80f6b65f205
+# github.com/anacrolix/torrent v1.57.1-0.20240918090318-144b57016ca9
## explicit; go 1.23
github.com/anacrolix/torrent
github.com/anacrolix/torrent/analysis
@@ -237,10 +235,10 @@ github.com/aws/aws-sdk-go-v2/internal/shareddefaults
github.com/aws/aws-sdk-go-v2/internal/strings
github.com/aws/aws-sdk-go-v2/internal/sync/singleflight
github.com/aws/aws-sdk-go-v2/internal/timeconv
-# github.com/aws/aws-sdk-go-v2/config v1.27.33
+# github.com/aws/aws-sdk-go-v2/config v1.27.35
## explicit; go 1.21
github.com/aws/aws-sdk-go-v2/config
-# github.com/aws/aws-sdk-go-v2/credentials v1.17.32
+# github.com/aws/aws-sdk-go-v2/credentials v1.17.33
## explicit; go 1.21
github.com/aws/aws-sdk-go-v2/credentials
github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds
@@ -268,28 +266,28 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding
# github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19
## explicit; go 1.21
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url
-# github.com/aws/aws-sdk-go-v2/service/route53 v1.43.2
+# github.com/aws/aws-sdk-go-v2/service/route53 v1.43.3
## explicit; go 1.21
github.com/aws/aws-sdk-go-v2/service/route53
github.com/aws/aws-sdk-go-v2/service/route53/internal/customizations
github.com/aws/aws-sdk-go-v2/service/route53/internal/endpoints
github.com/aws/aws-sdk-go-v2/service/route53/types
-# github.com/aws/aws-sdk-go-v2/service/sso v1.22.7
+# github.com/aws/aws-sdk-go-v2/service/sso v1.22.8
## explicit; go 1.21
github.com/aws/aws-sdk-go-v2/service/sso
github.com/aws/aws-sdk-go-v2/service/sso/internal/endpoints
github.com/aws/aws-sdk-go-v2/service/sso/types
-# github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7
+# github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.8
## explicit; go 1.21
github.com/aws/aws-sdk-go-v2/service/ssooidc
github.com/aws/aws-sdk-go-v2/service/ssooidc/internal/endpoints
github.com/aws/aws-sdk-go-v2/service/ssooidc/types
-# github.com/aws/aws-sdk-go-v2/service/sts v1.30.7
+# github.com/aws/aws-sdk-go-v2/service/sts v1.30.8
## explicit; go 1.21
github.com/aws/aws-sdk-go-v2/service/sts
github.com/aws/aws-sdk-go-v2/service/sts/internal/endpoints
github.com/aws/aws-sdk-go-v2/service/sts/types
-# github.com/aws/smithy-go v1.20.4
+# github.com/aws/smithy-go v1.21.0
## explicit; go 1.21
github.com/aws/smithy-go
github.com/aws/smithy-go/auth
@@ -309,6 +307,7 @@ github.com/aws/smithy-go/private/requestcompression
github.com/aws/smithy-go/ptr
github.com/aws/smithy-go/rand
github.com/aws/smithy-go/time
+github.com/aws/smithy-go/tracing
github.com/aws/smithy-go/transport/http
github.com/aws/smithy-go/transport/http/internal/io
github.com/aws/smithy-go/waiter
@@ -324,7 +323,7 @@ github.com/benbjohnson/immutable
# github.com/beorn7/perks v1.0.1
## explicit; go 1.11
github.com/beorn7/perks/quantile
-# github.com/bits-and-blooms/bitset v1.14.2
+# github.com/bits-and-blooms/bitset v1.14.3
## explicit; go 1.16
github.com/bits-and-blooms/bitset
# github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8
@@ -346,20 +345,20 @@ github.com/cespare/xxhash
# github.com/cespare/xxhash/v2 v2.3.0
## explicit; go 1.11
github.com/cespare/xxhash/v2
-# github.com/charmbracelet/bubbletea v1.1.0
+# github.com/charmbracelet/bubbletea v1.1.1
## explicit; go 1.18
github.com/charmbracelet/bubbletea
# github.com/charmbracelet/lipgloss v0.13.0
## explicit; go 1.18
github.com/charmbracelet/lipgloss
-# github.com/charmbracelet/x/ansi v0.2.3
+# github.com/charmbracelet/x/ansi v0.3.2
## explicit; go 1.18
github.com/charmbracelet/x/ansi
github.com/charmbracelet/x/ansi/parser
# github.com/charmbracelet/x/term v0.2.0
## explicit; go 1.18
github.com/charmbracelet/x/term
-# github.com/cloudflare/cloudflare-go v0.103.0
+# github.com/cloudflare/cloudflare-go v0.104.0
## explicit; go 1.19
github.com/cloudflare/cloudflare-go
# github.com/cockroachdb/errors v1.11.3
@@ -442,7 +441,7 @@ github.com/cockroachdb/tokenbucket
# github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be
## explicit
github.com/common-nighthawk/go-figure
-# github.com/consensys/bavard v0.1.13
+# github.com/consensys/bavard v0.1.15
## explicit; go 1.15
github.com/consensys/bavard
# github.com/consensys/gnark-crypto v0.14.0
@@ -459,7 +458,7 @@ github.com/consensys/gnark-crypto/field/hash
github.com/consensys/gnark-crypto/field/pool
github.com/consensys/gnark-crypto/internal/generator/config
github.com/consensys/gnark-crypto/internal/parallel
-# github.com/cpuguy83/go-md2man/v2 v2.0.4
+# github.com/cpuguy83/go-md2man/v2 v2.0.5
## explicit; go 1.11
github.com/cpuguy83/go-md2man/v2/md2man
# github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a
@@ -498,7 +497,7 @@ github.com/dgraph-io/badger/v4/skl
github.com/dgraph-io/badger/v4/table
github.com/dgraph-io/badger/v4/trie
github.com/dgraph-io/badger/v4/y
-# github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91
+# github.com/dgraph-io/ristretto v1.0.0
## explicit; go 1.19
github.com/dgraph-io/ristretto
github.com/dgraph-io/ristretto/z
@@ -507,7 +506,7 @@ github.com/dgraph-io/ristretto/z/simd
## explicit; go 1.13
github.com/dlclark/regexp2
github.com/dlclark/regexp2/syntax
-# github.com/dop251/goja v0.0.0-20240828124009-016eb7256539
+# github.com/dop251/goja v0.0.0-20240919115326-6c7d1df7ff05
## explicit; go 1.20
github.com/dop251/goja
github.com/dop251/goja/ast
@@ -550,7 +549,7 @@ github.com/garslo/gogen
# github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08
## explicit
github.com/gballet/go-libpcsclite
-# github.com/getsentry/sentry-go v0.28.1
+# github.com/getsentry/sentry-go v0.29.0
## explicit; go 1.18
github.com/getsentry/sentry-go
github.com/getsentry/sentry-go/internal/debug
@@ -578,8 +577,8 @@ github.com/go-logr/stdr
## explicit; go 1.12
github.com/go-ole/go-ole
github.com/go-ole/go-ole/oleutil
-# github.com/go-resty/resty/v2 v2.14.0
-## explicit; go 1.16
+# github.com/go-resty/resty/v2 v2.15.1
+## explicit; go 1.20
github.com/go-resty/resty/v2
github.com/go-resty/resty/v2/shellescape
# github.com/go-sourcemap/sourcemap v2.1.4+incompatible
@@ -629,7 +628,7 @@ github.com/google/go-querystring/query
## explicit; go 1.12
github.com/google/gofuzz
github.com/google/gofuzz/bytesource
-# github.com/google/pprof v0.0.0-20240903155634-a8630aee4ab9
+# github.com/google/pprof v0.0.0-20240910150728-a0b0bb1d4134
## explicit; go 1.22
github.com/google/pprof/profile
# github.com/google/uuid v1.6.0
@@ -854,7 +853,7 @@ github.com/pion/dtls/v2/pkg/protocol/alert
github.com/pion/dtls/v2/pkg/protocol/extension
github.com/pion/dtls/v2/pkg/protocol/handshake
github.com/pion/dtls/v2/pkg/protocol/recordlayer
-# github.com/pion/ice/v2 v2.3.34
+# github.com/pion/ice/v2 v2.3.35
## explicit; go 1.13
github.com/pion/ice/v2
github.com/pion/ice/v2/internal/atomic
@@ -918,7 +917,7 @@ github.com/pion/turn/v2/internal/client
github.com/pion/turn/v2/internal/ipnet
github.com/pion/turn/v2/internal/proto
github.com/pion/turn/v2/internal/server
-# github.com/pion/webrtc/v3 v3.3.0
+# github.com/pion/webrtc/v3 v3.3.3
## explicit; go 1.17
github.com/pion/webrtc/v3
github.com/pion/webrtc/v3/internal/fmtp
@@ -932,7 +931,7 @@ github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.0
## explicit
github.com/pmezard/go-difflib/difflib
-# github.com/prometheus/client_golang v1.20.3
+# github.com/prometheus/client_golang v1.20.4
## explicit; go 1.20
github.com/prometheus/client_golang/prometheus
github.com/prometheus/client_golang/prometheus/internal
@@ -1032,7 +1031,7 @@ github.com/ucwong/filecache
# github.com/ucwong/go-ttlmap v1.0.2-0.20221020173635-331e7ddde2bb
## explicit; go 1.19
github.com/ucwong/go-ttlmap
-# github.com/ucwong/golang-kv v1.0.24-0.20240909203057-3b4dd9a88aca
+# github.com/ucwong/golang-kv v1.0.24-0.20240918082513-1a48acf17d80
## explicit; go 1.22.0
github.com/ucwong/golang-kv
github.com/ucwong/golang-kv/badger
@@ -1076,8 +1075,8 @@ go.opencensus.io/internal
go.opencensus.io/trace
go.opencensus.io/trace/internal
go.opencensus.io/trace/tracestate
-# go.opentelemetry.io/otel v1.29.0
-## explicit; go 1.21
+# go.opentelemetry.io/otel v1.30.0
+## explicit; go 1.22
go.opentelemetry.io/otel
go.opentelemetry.io/otel/attribute
go.opentelemetry.io/otel/baggage
@@ -1087,12 +1086,12 @@ go.opentelemetry.io/otel/internal/attribute
go.opentelemetry.io/otel/internal/baggage
go.opentelemetry.io/otel/internal/global
go.opentelemetry.io/otel/propagation
-# go.opentelemetry.io/otel/metric v1.29.0
-## explicit; go 1.21
+# go.opentelemetry.io/otel/metric v1.30.0
+## explicit; go 1.22
go.opentelemetry.io/otel/metric
go.opentelemetry.io/otel/metric/embedded
-# go.opentelemetry.io/otel/trace v1.29.0
-## explicit; go 1.21
+# go.opentelemetry.io/otel/trace v1.30.0
+## explicit; go 1.22
go.opentelemetry.io/otel/trace
go.opentelemetry.io/otel/trace/embedded
# go.uber.org/automaxprocs v1.5.3
@@ -1275,7 +1274,7 @@ gopkg.in/yaml.v3
lukechampine.com/blake3
lukechampine.com/blake3/bao
lukechampine.com/blake3/guts
-# modernc.org/libc v1.60.1
+# modernc.org/libc v1.61.0
## explicit; go 1.20
modernc.org/libc
modernc.org/libc/errno
@@ -1309,7 +1308,7 @@ modernc.org/mathutil
# modernc.org/memory v1.8.0
## explicit; go 1.18
modernc.org/memory
-# modernc.org/sqlite v1.32.0
+# modernc.org/sqlite v1.33.1
## explicit; go 1.20
modernc.org/sqlite/lib
# rsc.io/tmplfunc v0.0.3
