Merge pull request #166 from vgarvardt/fix/otel-metrics-v0.37.0

fix: another one bc change in the otel metrics
vgarvardt · Feb 28, 2023 · 387ca8d · 387ca8d
2 parents 3b8ce4e + 4e6dc7a
commit 387ca8d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/client.go b/client.go
@@ -12,7 +12,6 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/instrument"
-	"go.opentelemetry.io/otel/metric/unit"
 
 	"github.com/vgarvardt/gue/v5/adapter"
 )
@@ -215,15 +214,15 @@ func (c *Client) initMetrics() (err error) {
 	if c.mEnqueue, err = c.meter.Int64Counter(
 		"gue_client_enqueue",
 		instrument.WithDescription("Number of jobs being enqueued"),
-		instrument.WithUnit(unit.Dimensionless),
+		instrument.WithUnit("1"),
 	); err != nil {
 		return fmt.Errorf("could not register mEnqueue metric: %w", err)
 	}
 
 	if c.mLockJob, err = c.meter.Int64Counter(
 		"gue_client_lock_job",
 		instrument.WithDescription("Number of jobs being locked (consumed)"),
-		instrument.WithUnit(unit.Dimensionless),
+		instrument.WithUnit("1"),
 	); err != nil {
 		return fmt.Errorf("could not register mLockJob metric: %w", err)
 	}

diff --git a/go.mod b/go.mod
@@ -11,9 +11,9 @@ require (
 	github.com/rs/zerolog v1.29.0
 	github.com/stretchr/testify v1.8.2
 	github.com/vgarvardt/backoff v1.0.0
-	go.opentelemetry.io/otel v1.13.0
-	go.opentelemetry.io/otel/metric v0.36.0
-	go.opentelemetry.io/otel/trace v1.13.0
+	go.opentelemetry.io/otel v1.14.0
+	go.opentelemetry.io/otel/metric v0.37.0
+	go.opentelemetry.io/otel/trace v1.14.0
 	go.uber.org/multierr v1.9.0
 	go.uber.org/zap v1.24.0
 	golang.org/x/sync v0.1.0

diff --git a/go.sum b/go.sum
@@ -142,12 +142,12 @@ github.com/vgarvardt/backoff v1.0.0 h1:VKub60RkA/po0gz0fHsr1vWb6pbyvOQpOs/4Ciw4a
 github.com/vgarvardt/backoff v1.0.0/go.mod h1:Om8PDVpm4MpRNDg/IKpJWsvS2MabY7LtwSahd09zg8E=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-go.opentelemetry.io/otel v1.13.0 h1:1ZAKnNQKwBBxFtww/GwxNUyTf0AxkZzrukO8MeXqe4Y=
-go.opentelemetry.io/otel v1.13.0/go.mod h1:FH3RtdZCzRkJYFTCsAKDy9l/XYjMdNv6QrkFFB8DvVg=
-go.opentelemetry.io/otel/metric v0.36.0 h1:t0lgGI+L68QWt3QtOIlqM9gXoxqxWLhZ3R/e5oOAY0Q=
-go.opentelemetry.io/otel/metric v0.36.0/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
-go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY=
-go.opentelemetry.io/otel/trace v1.13.0/go.mod h1:muCvmmO9KKpvuXSf3KKAXXB2ygNYHQ+ZfI5X08d3tds=
+go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
+go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
+go.opentelemetry.io/otel/metric v0.37.0 h1:pHDQuLQOZwYD+Km0eb657A25NaRzy0a+eLyKfDXedEs=
+go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s=
+go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
+go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/worker.go b/worker.go
@@ -12,7 +12,6 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/metric/instrument"
-	"go.opentelemetry.io/otel/metric/unit"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/multierr"
 	"golang.org/x/sync/errgroup"
@@ -273,15 +272,15 @@ func (w *Worker) initMetrics() (err error) {
 	if w.mWorked, err = w.meter.Int64Counter(
 		"gue_worker_jobs_worked",
 		instrument.WithDescription("Number of jobs processed"),
-		instrument.WithUnit(unit.Dimensionless),
+		instrument.WithUnit("1"),
 	); err != nil {
 		return fmt.Errorf("could not register mWorked metric: %w", err)
 	}
 
 	if w.mDuration, err = w.meter.Int64Histogram(
 		"gue_worker_jobs_duration",
 		instrument.WithDescription("Duration of the single locked job to be processed with all the hooks"),
-		instrument.WithUnit(unit.Milliseconds),
+		instrument.WithUnit("ms"),
 	); err != nil {
 		return fmt.Errorf("could not register mDuration metric: %w", err)
 	}