TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 19:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(deps): upgrade oidc and otel (#6468)

Browse Source
This commit is contained in:
Tim Möhlmann
2023-09-01 13:32:13 +03:00
committed by GitHub
parent d49be79778
commit 87cdd20d72
4 changed files with 281 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/telemetry/metrics/metrics.go
View File

@@ -6,7 +6,6 @@ import (
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/metric/instrument"
)
const (
@@ -23,8 +22,8 @@ type Metrics interface {
GetMetricsProvider() metric.MeterProvider
RegisterCounter(name, description string) error
AddCount(ctx context.Context, name string, value int64, labels map[string]attribute.Value) error
RegisterUpDownSumObserver(name, description string, callbackFunc instrument.Int64Callback) error
RegisterValueObserver(name, description string, callbackFunc instrument.Int64Callback) error
RegisterUpDownSumObserver(name, description string, callbackFunc metric.Int64Callback) error
RegisterValueObserver(name, description string, callbackFunc metric.Int64Callback) error
}
var M Metrics
@@ -57,14 +56,14 @@ func AddCount(ctx context.Context, name string, value int64, labels map[string]a
return M.AddCount(ctx, name, value, labels)
}
func RegisterUpDownSumObserver(name, description string, callbackFunc instrument.Int64Callback) error {
func RegisterUpDownSumObserver(name, description string, callbackFunc metric.Int64Callback) error {
if M == nil {
return nil
}
return M.RegisterUpDownSumObserver(name, description, callbackFunc)
}
func RegisterValueObserver(name, description string, callbackFunc instrument.Int64Callback) error {
func RegisterValueObserver(name, description string, callbackFunc metric.Int64Callback) error {
if M == nil {
return nil
}

17
internal/telemetry/metrics/otel/open_telemetry.go
View File

@@ -9,7 +9,6 @@ import (
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/exporters/prometheus"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/metric/instrument"
sdk_metric "go.opentelemetry.io/otel/sdk/metric"
caos_errs "github.com/zitadel/zitadel/internal/errors"
@@ -56,7 +55,7 @@ func (m *Metrics) RegisterCounter(name, description string) error {
if _, exists := m.Counters.Load(name); exists {
return nil
}
counter, err := m.Meter.Int64Counter(name, instrument.WithDescription(description))
counter, err := m.Meter.Int64Counter(name, metric.WithDescription(description))
if err != nil {
return err
}
@@ -69,16 +68,16 @@ func (m *Metrics) AddCount(ctx context.Context, name string, value int64, labels
if !exists {
return caos_errs.ThrowNotFound(nil, "METER-4u8fs", "Errors.Metrics.Counter.NotFound")
}
counter.(instrument.Int64Counter).Add(ctx, value, MapToKeyValue(labels)...)
counter.(metric.Int64Counter).Add(ctx, value, MapToAddOption(labels)...)
return nil
}
func (m *Metrics) RegisterUpDownSumObserver(name, description string, callbackFunc instrument.Int64Callback) error {
func (m *Metrics) RegisterUpDownSumObserver(name, description string, callbackFunc metric.Int64Callback) error {
if _, exists := m.UpDownSumObserver.Load(name); exists {
return nil
}
counter, err := m.Meter.Int64ObservableUpDownCounter(name, instrument.WithInt64Callback(callbackFunc), instrument.WithDescription(description))
counter, err := m.Meter.Int64ObservableUpDownCounter(name, metric.WithInt64Callback(callbackFunc), metric.WithDescription(description))
if err != nil {
return err
}
@@ -87,12 +86,12 @@ func (m *Metrics) RegisterUpDownSumObserver(name, description string, callbackFu
return nil
}
func (m *Metrics) RegisterValueObserver(name, description string, callbackFunc instrument.Int64Callback) error {
func (m *Metrics) RegisterValueObserver(name, description string, callbackFunc metric.Int64Callback) error {
if _, exists := m.UpDownSumObserver.Load(name); exists {
return nil
}
gauge, err := m.Meter.Int64ObservableGauge(name, instrument.WithInt64Callback(callbackFunc), instrument.WithDescription(description))
gauge, err := m.Meter.Int64ObservableGauge(name, metric.WithInt64Callback(callbackFunc), metric.WithDescription(description))
if err != nil {
return err
}
@@ -101,7 +100,7 @@ func (m *Metrics) RegisterValueObserver(name, description string, callbackFunc i
return nil
}
func MapToKeyValue(labels map[string]attribute.Value) []attribute.KeyValue {
func MapToAddOption(labels map[string]attribute.Value) []metric.AddOption {
if labels == nil {
return nil
}
@@ -112,5 +111,5 @@ func MapToKeyValue(labels map[string]attribute.Value) []attribute.KeyValue {
Value: value,
})
}
return keyValues
return []metric.AddOption{metric.WithAttributes(keyValues...)}
}