bump go.opentelemetry.io/otel (asynkron#870)

* remove instrument unit * bump go.opentelemetry.io/otel --------- Co-authored-by: tony <tony@ugaming.io>
Arttii · Aug 8, 2023 · 73f7ec5 · 73f7ec5
1 parent 011cf37
commit 73f7ec5
Show file tree

Hide file tree

Showing 10 changed files with 129 additions and 156 deletions.
diff --git a/_examples/opentelemetry-custom-provider/main.go b/_examples/opentelemetry-custom-provider/main.go
@@ -8,9 +8,9 @@ import (
 
 	console "github.com/asynkron/goconsole"
 	"github.com/asynkron/protoactor-go/actor"
+	"go.opentelemetry.io/otel"
 	stdout "go.opentelemetry.io/otel/exporters/stdout/stdoutmetric"
 	"go.opentelemetry.io/otel/metric"
-	"go.opentelemetry.io/otel/metric/global"
 	controller "go.opentelemetry.io/otel/sdk/metric/controller/basic"
 	processor "go.opentelemetry.io/otel/sdk/metric/processor/basic"
 	"go.opentelemetry.io/otel/sdk/metric/selector/simple"
@@ -62,7 +62,7 @@ func stdoutExporter(ctx context.Context) metric.MeterProvider {
 	if err := provider.Start(ctx); err != nil {
 		log.Fatalf("could not start push controller: %v", err)
 	}
-	global.SetMeterProvider(provider)
+	otel.SetMeterProvider(provider)
 
 	return provider
 }
diff --git a/actor/actor_context.go b/actor/actor_context.go
@@ -12,6 +12,7 @@ import (
 	"github.com/asynkron/protoactor-go/metrics"
 	"github.com/emirpasic/gods/stacks/linkedliststack"
 	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric"
 )
 
 const (
@@ -428,7 +429,7 @@ func (ctx *actorContext) Stop(pid *PID) {
 		if ok && metricsSystem.enabled {
 			_ctx := context.Background()
 			if instruments := metricsSystem.metrics.Get(metrics.InternalActorMetrics); instruments != nil {
-				instruments.ActorStoppedCount.Add(_ctx, 1, metricsSystem.CommonLabels(ctx)...)
+				instruments.ActorStoppedCount.Add(_ctx, 1, metric.WithAttributes(metricsSystem.CommonLabels(ctx)...))
 			}
 		}
 	}
@@ -497,7 +498,7 @@ func (ctx *actorContext) InvokeUserMessage(md interface{}) {
 				systemMetrics.CommonLabels(ctx),
 				attribute.String("messagetype", fmt.Sprintf("%T", md)),
 			)
-			histogram.Record(_ctx, delta.Seconds(), labels...)
+			histogram.Record(_ctx, delta.Seconds(), metric.WithAttributes(labels...))
 		}
 	} else {
 		ctx.processMessage(md)
@@ -534,7 +535,8 @@ func (ctx *actorContext) incarnateActor() {
 	if ok && metricsSystem.enabled {
 		_ctx := context.Background()
 		if instruments := metricsSystem.metrics.Get(metrics.InternalActorMetrics); instruments != nil {
-			instruments.ActorSpawnCount.Add(_ctx, 1, metricsSystem.CommonLabels(ctx)...)		}
+			instruments.ActorSpawnCount.Add(_ctx, 1, metric.WithAttributes(metricsSystem.CommonLabels(ctx)...))
+		}
 	}
 }
 
@@ -597,7 +599,7 @@ func (ctx *actorContext) handleRestart() {
 	if ok && metricsSystem.enabled {
 		_ctx := context.Background()
 		if instruments := metricsSystem.metrics.Get(metrics.InternalActorMetrics); instruments != nil {
-			instruments.ActorRestartedCount.Add(_ctx, 1, metricsSystem.CommonLabels(ctx)...)
+			instruments.ActorRestartedCount.Add(_ctx, 1, metric.WithAttributes(metricsSystem.CommonLabels(ctx)...))
 		}
 	}
 }
@@ -709,7 +711,7 @@ func (ctx *actorContext) EscalateFailure(reason interface{}, message interface{}
 	if ok && metricsSystem.enabled {
 		_ctx := context.Background()
 		if instruments := metricsSystem.metrics.Get(metrics.InternalActorMetrics); instruments != nil {
-			instruments.ActorFailureCount.Add(_ctx, 1, metricsSystem.CommonLabels(ctx)...)
+			instruments.ActorFailureCount.Add(_ctx, 1, metric.WithAttributes(metricsSystem.CommonLabels(ctx)...))
 		}
 	}
 

diff --git a/actor/config.go b/actor/config.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/asynkron/protoactor-go/log"
+	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/exporters/prometheus"
 	"go.opentelemetry.io/otel/metric"
-	"go.opentelemetry.io/otel/metric/global"
 	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -46,7 +46,7 @@ func defaultPrometheusProvider(port int) metric.MeterProvider {
 	}
 
 	provider := sdkmetric.NewMeterProvider(sdkmetric.WithReader(exporter.Reader))
-	global.SetMeterProvider(provider)
+	otel.SetMeterProvider(provider)
 
 	http.Handle("/", promhttp.Handler())
 	_port := fmt.Sprintf(":%d", port)

diff --git a/actor/deadletter.go b/actor/deadletter.go
@@ -8,6 +8,7 @@ import (
 	"github.com/asynkron/protoactor-go/log"
 	"github.com/asynkron/protoactor-go/metrics"
 	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric"
 )
 
 type deadLetterProcess struct {
@@ -82,7 +83,7 @@ func (dp *deadLetterProcess) SendUserMessage(pid *PID, message interface{}) {
 				attribute.String("messagetype", strings.Replace(fmt.Sprintf("%T", message), "*", "", 1)),
 			}
 
-			instruments.DeadLetterCount.Add(ctx, 1, labels...)
+			instruments.DeadLetterCount.Add(ctx, 1, metric.WithAttributes(labels...))
 		}
 	}
 	_, msg, sender := UnwrapEnvelope(message)

diff --git a/actor/future.go b/actor/future.go
@@ -11,6 +11,7 @@ import (
 	"github.com/asynkron/protoactor-go/log"
 	"github.com/asynkron/protoactor-go/metrics"
 	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric"
 )
 
 // ErrTimeout is the error used when a future times out before receiving a result.
@@ -37,7 +38,7 @@ func NewFuture(actorSystem *ActorSystem, d time.Duration) *Future {
 				attribute.String("address", ref.actorSystem.Address()),
 			}
 
-			instruments.FuturesStartedCount.Add(ctx, 1, labels...)
+			instruments.FuturesStartedCount.Add(ctx, 1, metric.WithAttributes(labels...))
 		}
 	}
 
@@ -180,9 +181,9 @@ func (ref *futureProcess) instrument() {
 		instruments := sysMetrics.metrics.Get(metrics.InternalActorMetrics)
 		if instruments != nil {
 			if ref.err == nil {
-				instruments.FuturesCompletedCount.Add(ctx, 1, labels...)
+				instruments.FuturesCompletedCount.Add(ctx, 1, metric.WithAttributes(labels...))
 			} else {
-				instruments.FuturesTimedOutCount.Add(ctx, 1, labels...)
+				instruments.FuturesTimedOutCount.Add(ctx, 1, metric.WithAttributes(labels...))
 			}
 		}
 	}

diff --git a/actor/metrics.go b/actor/metrics.go
@@ -10,11 +10,9 @@ import (
 
 	"github.com/asynkron/protoactor-go/extensions"
 	"github.com/asynkron/protoactor-go/metrics"
+	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
-	"go.opentelemetry.io/otel/metric/global"
-	"go.opentelemetry.io/otel/metric/instrument"
-	"go.opentelemetry.io/otel/metric/unit"
 )
 
 var extensionId = extensions.NextExtensionID()
@@ -46,10 +44,10 @@ func NewMetrics(provider metric.MeterProvider) *Metrics {
 }
 
 func (m *Metrics) PrepareMailboxLengthGauge() {
-	meter := global.Meter(metrics.LibName)
+	meter := otel.Meter(metrics.LibName)
 	gauge, err := meter.Int64ObservableGauge("protoactor_actor_mailbox_length",
-		instrument.WithDescription("Actor's Mailbox Length"),
-		instrument.WithUnit(unit.Dimensionless))
+		metric.WithDescription("Actor's Mailbox Length"),
+		metric.WithUnit("1"))
 	if err != nil {
 		err = fmt.Errorf("failed to create ActorMailBoxLength instrument, %w", err)
 		plog.Error(err.Error(), log.Error(err))

diff --git a/actor/props.go b/actor/props.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/asynkron/protoactor-go/log"
 	"github.com/asynkron/protoactor-go/metrics"
+	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/metric"
-	"go.opentelemetry.io/otel/metric/global"
 )
 
 type (
@@ -33,10 +33,10 @@ var (
 			if ok && sysMetrics.enabled {
 				if instruments := sysMetrics.metrics.Get(metrics.InternalActorMetrics); instruments != nil {
 					sysMetrics.PrepareMailboxLengthGauge()
-					meter := global.Meter(metrics.LibName)
+					meter := otel.Meter(metrics.LibName)
 
 					if _, err := meter.RegisterCallback(func(_ context.Context, o metric.Observer) error {
-						o.ObserveInt64(instruments.ActorMailboxLength,int64(mb.UserMessageCount()), sysMetrics.CommonLabels(ctx)... )
+						o.ObserveInt64(instruments.ActorMailboxLength, int64(mb.UserMessageCount()), metric.WithAttributes(sysMetrics.CommonLabels(ctx)...))
 						return nil
 					}); err != nil {
 						err = fmt.Errorf("failed to instrument Actor Mailbox, %w", err)

diff --git a/go.mod b/go.mod
@@ -14,33 +14,33 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b
-	github.com/stretchr/testify v1.8.1
-	go.opentelemetry.io/otel v1.12.0
-	go.opentelemetry.io/otel/exporters/prometheus v0.35.0
-	go.opentelemetry.io/otel/metric v0.35.0
-	golang.org/x/net v0.11.0
-	google.golang.org/grpc v1.56.0
-	google.golang.org/protobuf v1.30.0
+	github.com/stretchr/testify v1.8.4
+	go.opentelemetry.io/otel v1.16.0
+	go.opentelemetry.io/otel/exporters/prometheus v0.39.0
+	go.opentelemetry.io/otel/metric v1.16.0
+	go.opentelemetry.io/otel/sdk/metric v0.39.0
+	golang.org/x/net v0.8.0
+	google.golang.org/grpc v1.55.0 // indirect
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
+	github.com/bufbuild/connect-go v1.8.0
 	github.com/go-zookeeper/zk v1.0.3
 	github.com/golang/mock v1.5.0
 	github.com/labstack/echo v3.3.10+incompatible
 	github.com/lithammer/shortuuid/v4 v4.0.0
+	github.com/rs/cors v1.9.0
 	github.com/twmb/murmur3 v1.1.6
-	go.etcd.io/etcd/client/v3 v3.5.9
-	go.opentelemetry.io/otel/sdk/metric v0.35.0
+	go.etcd.io/etcd/client/v3 v3.5.7
 	golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf
-	golang.org/x/sync v0.1.0
+	golang.org/x/sync v0.2.0
 	k8s.io/api v0.26.1
 	k8s.io/apimachinery v0.26.1
 	k8s.io/client-go v0.26.1
 )
 
 require (
-	github.com/bufbuild/connect-go v1.8.0 // indirect
-	github.com/rs/cors v1.9.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
 )
@@ -54,7 +54,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
@@ -84,28 +84,28 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.14.0
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/prometheus/client_golang v1.16.0
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.1 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
-	go.opentelemetry.io/otel/sdk v1.12.0 // indirect
-	go.opentelemetry.io/otel/trace v1.12.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
+	go.opentelemetry.io/otel/sdk v1.16.0 // indirect
+	go.opentelemetry.io/otel/trace v1.16.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.10.0 // indirect
-	golang.org/x/oauth2 v0.7.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/term v0.9.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/oauth2 v0.6.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/term v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect
 	gopkg.in/couchbase/gocbcore.v7 v7.1.18 // indirect
 	gopkg.in/couchbaselabs/gocbconnstr.v1 v1.0.4 // indirect
 	gopkg.in/couchbaselabs/gojcbmock.v1 v1.0.4 // indirect