mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-12-16 22:13:01 -06: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
78
vendor/go.opentelemetry.io/otel/exporters/prometheus/config.go
generated
vendored
78
vendor/go.opentelemetry.io/otel/exporters/prometheus/config.go
generated
vendored
|
|
@ -7,6 +7,8 @@ import (
|
|||
"sync"
|
||||
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"github.com/prometheus/common/model"
|
||||
"github.com/prometheus/otlptranslator"
|
||||
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
"go.opentelemetry.io/otel/internal/global"
|
||||
|
|
@ -17,6 +19,7 @@ import (
|
|||
type config struct {
|
||||
registerer prometheus.Registerer
|
||||
disableTargetInfo bool
|
||||
translationStrategy otlptranslator.TranslationStrategyOption
|
||||
withoutUnits bool
|
||||
withoutCounterSuffixes bool
|
||||
readerOpts []metric.ManualReaderOption
|
||||
|
|
@ -25,9 +28,9 @@ type config struct {
|
|||
resourceAttributesFilter attribute.Filter
|
||||
}
|
||||
|
||||
var logDeprecatedLegacyScheme = sync.OnceFunc(func() {
|
||||
var logTemporaryDefault = sync.OnceFunc(func() {
|
||||
global.Warn(
|
||||
"prometheus exporter legacy scheme deprecated: support for the legacy NameValidationScheme will be removed in a future release",
|
||||
"The default Prometheus naming translation strategy is planned to be changed from otlptranslator.NoUTF8EscapingWithSuffixes to otlptranslator.UnderscoreEscapingWithSuffixes in a future release. Add prometheus.WithTranslationStrategy(otlptranslator.NoUTF8EscapingWithSuffixes) to preserve the existing behavior, or prometheus.WithTranslationStrategy(otlptranslator.UnderscoreEscapingWithSuffixes) to opt into the future default behavior.",
|
||||
)
|
||||
})
|
||||
|
||||
|
|
@ -38,6 +41,30 @@ func newConfig(opts ...Option) config {
|
|||
cfg = opt.apply(cfg)
|
||||
}
|
||||
|
||||
if cfg.translationStrategy == "" {
|
||||
// If no translation strategy was specified, deduce one based on the global
|
||||
// NameValidationScheme. NOTE: this logic will change in the future, always
|
||||
// defaulting to UnderscoreEscapingWithSuffixes
|
||||
|
||||
//nolint:staticcheck // NameValidationScheme is deprecated but we still need it for now.
|
||||
if model.NameValidationScheme == model.UTF8Validation {
|
||||
logTemporaryDefault()
|
||||
cfg.translationStrategy = otlptranslator.NoUTF8EscapingWithSuffixes
|
||||
} else {
|
||||
cfg.translationStrategy = otlptranslator.UnderscoreEscapingWithSuffixes
|
||||
}
|
||||
} else {
|
||||
// Note, if the translation strategy implies that suffixes should be added,
|
||||
// the user can still use WithoutUnits and WithoutCounterSuffixes to
|
||||
// explicitly disable specific suffixes. We do not override their preference
|
||||
// in this case. However if the chosen strategy disables suffixes, we should
|
||||
// forcibly disable all of them.
|
||||
if !cfg.translationStrategy.ShouldAddSuffixes() {
|
||||
cfg.withoutCounterSuffixes = true
|
||||
cfg.withoutUnits = true
|
||||
}
|
||||
}
|
||||
|
||||
if cfg.registerer == nil {
|
||||
cfg.registerer = prometheus.DefaultRegisterer
|
||||
}
|
||||
|
|
@ -95,6 +122,30 @@ func WithoutTargetInfo() Option {
|
|||
})
|
||||
}
|
||||
|
||||
// WithTranslationStrategy provides a standardized way to define how metric and
|
||||
// label names should be handled during translation to Prometheus format. See:
|
||||
// https://github.com/open-telemetry/opentelemetry-specification/blob/v1.48.0/specification/metrics/sdk_exporters/prometheus.md#configuration.
|
||||
// The recommended approach is to use either
|
||||
// [otlptranslator.UnderscoreEscapingWithSuffixes] for full Prometheus-style
|
||||
// compatibility or [otlptranslator.NoTranslation] for OpenTelemetry-style names.
|
||||
//
|
||||
// By default, if the NameValidationScheme variable in
|
||||
// [github.com/prometheus/common/model] is "legacy", the default strategy is
|
||||
// [otlptranslator.UnderscoreEscapingWithSuffixes]. If the validation scheme is
|
||||
// "utf8", then currently the default Strategy is
|
||||
// [otlptranslator.NoUTF8EscapingWithSuffixes].
|
||||
//
|
||||
// Notice: It is planned that a future release of this SDK will change the
|
||||
// default to always be [otlptranslator.UnderscoreEscapingWithSuffixes] in all
|
||||
// circumstances. Users wanting a different translation strategy should specify
|
||||
// it explicitly.
|
||||
func WithTranslationStrategy(strategy otlptranslator.TranslationStrategyOption) Option {
|
||||
return optionFunc(func(cfg config) config {
|
||||
cfg.translationStrategy = strategy
|
||||
return cfg
|
||||
})
|
||||
}
|
||||
|
||||
// WithoutUnits disables exporter's addition of unit suffixes to metric names,
|
||||
// and will also prevent unit comments from being added in OpenMetrics once
|
||||
// unit comments are supported.
|
||||
|
|
@ -103,6 +154,12 @@ func WithoutTargetInfo() Option {
|
|||
// conventions. For example, the counter metric request.duration, with unit
|
||||
// milliseconds would become request_duration_milliseconds_total.
|
||||
// With this option set, the name would instead be request_duration_total.
|
||||
//
|
||||
// Can be used in conjunction with [WithTranslationStrategy] to disable unit
|
||||
// suffixes in strategies that would otherwise add suffixes, but this behavior
|
||||
// is not recommended and may be removed in a future release.
|
||||
//
|
||||
// Deprecated: Use [WithTranslationStrategy] instead.
|
||||
func WithoutUnits() Option {
|
||||
return optionFunc(func(cfg config) config {
|
||||
cfg.withoutUnits = true
|
||||
|
|
@ -110,12 +167,19 @@ func WithoutUnits() Option {
|
|||
})
|
||||
}
|
||||
|
||||
// WithoutCounterSuffixes disables exporter's addition _total suffixes on counters.
|
||||
// WithoutCounterSuffixes disables exporter's addition _total suffixes on
|
||||
// counters.
|
||||
//
|
||||
// By default, metric names include a _total suffix to follow Prometheus naming
|
||||
// conventions. For example, the counter metric happy.people would become
|
||||
// happy_people_total. With this option set, the name would instead be
|
||||
// happy_people.
|
||||
//
|
||||
// Can be used in conjunction with [WithTranslationStrategy] to disable counter
|
||||
// suffixes in strategies that would otherwise add suffixes, but this behavior
|
||||
// is not recommended and may be removed in a future release.
|
||||
//
|
||||
// Deprecated: Use [WithTranslationStrategy] instead.
|
||||
func WithoutCounterSuffixes() Option {
|
||||
return optionFunc(func(cfg config) config {
|
||||
cfg.withoutCounterSuffixes = true
|
||||
|
|
@ -132,9 +196,11 @@ func WithoutScopeInfo() Option {
|
|||
})
|
||||
}
|
||||
|
||||
// WithNamespace configures the Exporter to prefix metric with the given namespace.
|
||||
// Metadata metrics such as target_info are not prefixed since these
|
||||
// have special behavior based on their name.
|
||||
// WithNamespace configures the Exporter to prefix metric with the given
|
||||
// namespace. Metadata metrics such as target_info are not prefixed since these
|
||||
// have special behavior based on their name. Namespaces will be prepended even
|
||||
// if [otlptranslator.NoTranslation] is set as a translation strategy. If the provided namespace
|
||||
// is empty, nothing will be prepended to metric names.
|
||||
func WithNamespace(ns string) Option {
|
||||
return optionFunc(func(cfg config) config {
|
||||
cfg.namespace = ns
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue