mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 18:12:24 -05:00 
			
		
		
		
	[chore] bump dependencies (#4406)
- codeberg.org/gruf/go-ffmpreg: v0.6.9 -> v0.6.10
- github.com/ncruces/go-sqlite3: v0.27.1 -> v0.28.0
- github.com/stretchr/testify: v1.10.0 -> v1.11.1
- github.com/tdewolff/minify/v2 v2.23.11 -> v2.24.2
- go.opentelemetry.io/otel{,/*}: v1.37.0 -> v1.38.0
- go.opentelemetry.io/contrib/*: v0.62.0 -> v0.63.0
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4406
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
	
	
This commit is contained in:
		
					parent
					
						
							
								5a54e7156b
							
						
					
				
			
			
				commit
				
					
						78defcd916
					
				
			
		
					 274 changed files with 9213 additions and 2368 deletions
				
			
		
							
								
								
									
										4
									
								
								vendor/github.com/prometheus/client_golang/prometheus/internal/difflib.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								vendor/github.com/prometheus/client_golang/prometheus/internal/difflib.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -453,7 +453,7 @@ func (m *SequenceMatcher) GetGroupedOpCodes(n int) [][]OpCode { | |||
| 		} | ||||
| 		group = append(group, OpCode{c.Tag, i1, i2, j1, j2}) | ||||
| 	} | ||||
| 	if len(group) > 0 && !(len(group) == 1 && group[0].Tag == 'e') { | ||||
| 	if len(group) > 0 && (len(group) != 1 || group[0].Tag != 'e') { | ||||
| 		groups = append(groups, group) | ||||
| 	} | ||||
| 	return groups | ||||
|  | @ -568,7 +568,7 @@ func WriteUnifiedDiff(writer io.Writer, diff UnifiedDiff) error { | |||
| 	buf := bufio.NewWriter(writer) | ||||
| 	defer buf.Flush() | ||||
| 	wf := func(format string, args ...interface{}) error { | ||||
| 		_, err := buf.WriteString(fmt.Sprintf(format, args...)) | ||||
| 		_, err := fmt.Fprintf(buf, format, args...) | ||||
| 		return err | ||||
| 	} | ||||
| 	ws := func(s string) error { | ||||
|  |  | |||
							
								
								
									
										25
									
								
								vendor/github.com/prometheus/client_golang/prometheus/metric.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										25
									
								
								vendor/github.com/prometheus/client_golang/prometheus/metric.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -186,21 +186,31 @@ func (m *withExemplarsMetric) Write(pb *dto.Metric) error { | |||
| 	case pb.Counter != nil: | ||||
| 		pb.Counter.Exemplar = m.exemplars[len(m.exemplars)-1] | ||||
| 	case pb.Histogram != nil: | ||||
| 		h := pb.Histogram | ||||
| 		for _, e := range m.exemplars { | ||||
| 			// pb.Histogram.Bucket are sorted by UpperBound. | ||||
| 			i := sort.Search(len(pb.Histogram.Bucket), func(i int) bool { | ||||
| 				return pb.Histogram.Bucket[i].GetUpperBound() >= e.GetValue() | ||||
| 			if (h.GetZeroThreshold() != 0 || h.GetZeroCount() != 0 || | ||||
| 				len(h.PositiveSpan) != 0 || len(h.NegativeSpan) != 0) && | ||||
| 				e.GetTimestamp() != nil { | ||||
| 				h.Exemplars = append(h.Exemplars, e) | ||||
| 				if len(h.Bucket) == 0 { | ||||
| 					// Don't proceed to classic buckets if there are none. | ||||
| 					continue | ||||
| 				} | ||||
| 			} | ||||
| 			// h.Bucket are sorted by UpperBound. | ||||
| 			i := sort.Search(len(h.Bucket), func(i int) bool { | ||||
| 				return h.Bucket[i].GetUpperBound() >= e.GetValue() | ||||
| 			}) | ||||
| 			if i < len(pb.Histogram.Bucket) { | ||||
| 				pb.Histogram.Bucket[i].Exemplar = e | ||||
| 			if i < len(h.Bucket) { | ||||
| 				h.Bucket[i].Exemplar = e | ||||
| 			} else { | ||||
| 				// The +Inf bucket should be explicitly added if there is an exemplar for it, similar to non-const histogram logic in https://github.com/prometheus/client_golang/blob/main/prometheus/histogram.go#L357-L365. | ||||
| 				b := &dto.Bucket{ | ||||
| 					CumulativeCount: proto.Uint64(pb.Histogram.GetSampleCount()), | ||||
| 					CumulativeCount: proto.Uint64(h.GetSampleCount()), | ||||
| 					UpperBound:      proto.Float64(math.Inf(1)), | ||||
| 					Exemplar:        e, | ||||
| 				} | ||||
| 				pb.Histogram.Bucket = append(pb.Histogram.Bucket, b) | ||||
| 				h.Bucket = append(h.Bucket, b) | ||||
| 			} | ||||
| 		} | ||||
| 	default: | ||||
|  | @ -227,6 +237,7 @@ type Exemplar struct { | |||
| // Only last applicable exemplar is injected from the list. | ||||
| // For example for Counter it means last exemplar is injected. | ||||
| // For Histogram, it means last applicable exemplar for each bucket is injected. | ||||
| // For a Native Histogram, all valid exemplars are injected. | ||||
| // | ||||
| // NewMetricWithExemplars works best with MustNewConstMetric and | ||||
| // MustNewConstHistogram, see example. | ||||
|  |  | |||
							
								
								
									
										6
									
								
								vendor/github.com/prometheus/client_golang/prometheus/process_collector_darwin.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/github.com/prometheus/client_golang/prometheus/process_collector_darwin.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -25,9 +25,9 @@ import ( | |||
| 	"golang.org/x/sys/unix" | ||||
| ) | ||||
| 
 | ||||
| // notImplementedErr is returned by stub functions that replace cgo functions, when cgo | ||||
| // errNotImplemented is returned by stub functions that replace cgo functions, when cgo | ||||
| // isn't available. | ||||
| var notImplementedErr = errors.New("not implemented") | ||||
| var errNotImplemented = errors.New("not implemented") | ||||
| 
 | ||||
| type memoryInfo struct { | ||||
| 	vsize uint64 // Virtual memory size in bytes | ||||
|  | @ -101,7 +101,7 @@ func (c *processCollector) processCollect(ch chan<- Metric) { | |||
| 	if memInfo, err := getMemory(); err == nil { | ||||
| 		ch <- MustNewConstMetric(c.rss, GaugeValue, float64(memInfo.rss)) | ||||
| 		ch <- MustNewConstMetric(c.vsize, GaugeValue, float64(memInfo.vsize)) | ||||
| 	} else if !errors.Is(err, notImplementedErr) { | ||||
| 	} else if !errors.Is(err, errNotImplemented) { | ||||
| 		// Don't report an error when support is not compiled in. | ||||
| 		c.reportError(ch, c.rss, err) | ||||
| 		c.reportError(ch, c.vsize, err) | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ | |||
| package prometheus | ||||
| 
 | ||||
| func getMemory() (*memoryInfo, error) { | ||||
| 	return nil, notImplementedErr | ||||
| 	return nil, errNotImplemented | ||||
| } | ||||
| 
 | ||||
| // describe returns all descriptions of the collector for Darwin. | ||||
|  |  | |||
|  | @ -66,11 +66,11 @@ func (c *processCollector) processCollect(ch chan<- Metric) { | |||
| 
 | ||||
| 	if netstat, err := p.Netstat(); err == nil { | ||||
| 		var inOctets, outOctets float64 | ||||
| 		if netstat.IpExt.InOctets != nil { | ||||
| 			inOctets = *netstat.IpExt.InOctets | ||||
| 		if netstat.InOctets != nil { | ||||
| 			inOctets = *netstat.InOctets | ||||
| 		} | ||||
| 		if netstat.IpExt.OutOctets != nil { | ||||
| 			outOctets = *netstat.IpExt.OutOctets | ||||
| 		if netstat.OutOctets != nil { | ||||
| 			outOctets = *netstat.OutOctets | ||||
| 		} | ||||
| 		ch <- MustNewConstMetric(c.inBytes, CounterValue, inOctets) | ||||
| 		ch <- MustNewConstMetric(c.outBytes, CounterValue, outOctets) | ||||
|  |  | |||
							
								
								
									
										2
									
								
								vendor/github.com/prometheus/client_golang/prometheus/promhttp/instrument_server.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/prometheus/client_golang/prometheus/promhttp/instrument_server.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -392,7 +392,7 @@ func isLabelCurried(c prometheus.Collector, label string) bool { | |||
| func labels(code, method bool, reqMethod string, status int, extraMethods ...string) prometheus.Labels { | ||||
| 	labels := prometheus.Labels{} | ||||
| 
 | ||||
| 	if !(code || method) { | ||||
| 	if !code && !method { | ||||
| 		return labels | ||||
| 	} | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										10
									
								
								vendor/github.com/prometheus/client_golang/prometheus/vec.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								vendor/github.com/prometheus/client_golang/prometheus/vec.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -79,7 +79,7 @@ func (m *MetricVec) DeleteLabelValues(lvs ...string) bool { | |||
| 		return false | ||||
| 	} | ||||
| 
 | ||||
| 	return m.metricMap.deleteByHashWithLabelValues(h, lvs, m.curry) | ||||
| 	return m.deleteByHashWithLabelValues(h, lvs, m.curry) | ||||
| } | ||||
| 
 | ||||
| // Delete deletes the metric where the variable labels are the same as those | ||||
|  | @ -101,7 +101,7 @@ func (m *MetricVec) Delete(labels Labels) bool { | |||
| 		return false | ||||
| 	} | ||||
| 
 | ||||
| 	return m.metricMap.deleteByHashWithLabels(h, labels, m.curry) | ||||
| 	return m.deleteByHashWithLabels(h, labels, m.curry) | ||||
| } | ||||
| 
 | ||||
| // DeletePartialMatch deletes all metrics where the variable labels contain all of those | ||||
|  | @ -114,7 +114,7 @@ func (m *MetricVec) DeletePartialMatch(labels Labels) int { | |||
| 	labels, closer := constrainLabels(m.desc, labels) | ||||
| 	defer closer() | ||||
| 
 | ||||
| 	return m.metricMap.deleteByLabels(labels, m.curry) | ||||
| 	return m.deleteByLabels(labels, m.curry) | ||||
| } | ||||
| 
 | ||||
| // Without explicit forwarding of Describe, Collect, Reset, those methods won't | ||||
|  | @ -216,7 +216,7 @@ func (m *MetricVec) GetMetricWithLabelValues(lvs ...string) (Metric, error) { | |||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	return m.metricMap.getOrCreateMetricWithLabelValues(h, lvs, m.curry), nil | ||||
| 	return m.getOrCreateMetricWithLabelValues(h, lvs, m.curry), nil | ||||
| } | ||||
| 
 | ||||
| // GetMetricWith returns the Metric for the given Labels map (the label names | ||||
|  | @ -244,7 +244,7 @@ func (m *MetricVec) GetMetricWith(labels Labels) (Metric, error) { | |||
| 		return nil, err | ||||
| 	} | ||||
| 
 | ||||
| 	return m.metricMap.getOrCreateMetricWithLabels(h, labels, m.curry), nil | ||||
| 	return m.getOrCreateMetricWithLabels(h, labels, m.curry), nil | ||||
| } | ||||
| 
 | ||||
| func (m *MetricVec) hashLabelValues(vals []string) (uint64, error) { | ||||
|  |  | |||
							
								
								
									
										36
									
								
								vendor/github.com/prometheus/client_golang/prometheus/wrap.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										36
									
								
								vendor/github.com/prometheus/client_golang/prometheus/wrap.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -63,7 +63,7 @@ func WrapRegistererWith(labels Labels, reg Registerer) Registerer { | |||
| // metric names that are standardized across applications, as that would break | ||||
| // horizontal monitoring, for example the metrics provided by the Go collector | ||||
| // (see NewGoCollector) and the process collector (see NewProcessCollector). (In | ||||
| // fact, those metrics are already prefixed with “go_” or “process_”, | ||||
| // fact, those metrics are already prefixed with "go_" or "process_", | ||||
| // respectively.) | ||||
| // | ||||
| // Conflicts between Collectors registered through the original Registerer with | ||||
|  | @ -78,6 +78,40 @@ func WrapRegistererWithPrefix(prefix string, reg Registerer) Registerer { | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| // WrapCollectorWith returns a Collector wrapping the provided Collector. The | ||||
| // wrapped Collector will add the provided Labels to all Metrics it collects (as | ||||
| // ConstLabels). The Metrics collected by the unmodified Collector must not | ||||
| // duplicate any of those labels. | ||||
| // | ||||
| // WrapCollectorWith can be useful to work with multiple instances of a third | ||||
| // party library that does not expose enough flexibility on the lifecycle of its | ||||
| // registered metrics. | ||||
| // For example, let's say you have a foo.New(reg Registerer) constructor that | ||||
| // registers metrics but never unregisters them, and you want to create multiple | ||||
| // instances of foo.Foo with different labels. | ||||
| // The way to achieve that, is to create a new Registry, pass it to foo.New, | ||||
| // then use WrapCollectorWith to wrap that Registry with the desired labels and | ||||
| // register that as a collector in your main Registry. | ||||
| // Then you can un-register the wrapped collector effectively un-registering the | ||||
| // metrics registered by foo.New. | ||||
| func WrapCollectorWith(labels Labels, c Collector) Collector { | ||||
| 	return &wrappingCollector{ | ||||
| 		wrappedCollector: c, | ||||
| 		labels:           labels, | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| // WrapCollectorWithPrefix returns a Collector wrapping the provided Collector. The | ||||
| // wrapped Collector will add the provided prefix to the name of all Metrics it collects. | ||||
| // | ||||
| // See the documentation of WrapCollectorWith for more details on the use case. | ||||
| func WrapCollectorWithPrefix(prefix string, c Collector) Collector { | ||||
| 	return &wrappingCollector{ | ||||
| 		wrappedCollector: c, | ||||
| 		prefix:           prefix, | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| type wrappingRegisterer struct { | ||||
| 	wrappedRegisterer Registerer | ||||
| 	prefix            string | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue