remove consul as dependency in consul-container to again resolve tenc…

…entcloud ambiguous import. also fix another otel metric issue due to missing upgrade
hashicorp · Sep 18, 2024 · 68409ab · 68409ab
1 parent 14457aa
commit 68409ab
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/agent/hcp/telemetry/otel_exporter_test.go b/agent/hcp/telemetry/otel_exporter_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/armon/go-metrics"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/sdk/metric"
-	"go.opentelemetry.io/otel/sdk/metric/aggregation"
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 	"go.opentelemetry.io/otel/sdk/resource"
 	metricpb "go.opentelemetry.io/proto/otlp/metrics/v1"
@@ -50,19 +49,19 @@ func TestAggregation(t *testing.T) {
 	t.Parallel()
 	for name, test := range map[string]struct {
 		kind   metric.InstrumentKind
-		expAgg aggregation.Aggregation
+		expAgg metric.Aggregation
 	}{
 		"gauge": {
 			kind:   metric.InstrumentKindObservableGauge,
-			expAgg: aggregation.LastValue{},
+			expAgg: metric.AggregationLastValue{},
 		},
 		"counter": {
 			kind:   metric.InstrumentKindCounter,
-			expAgg: aggregation.Sum{},
+			expAgg: metric.AggregationSum{},
 		},
 		"histogram": {
 			kind:   metric.InstrumentKindHistogram,
-			expAgg: aggregation.ExplicitBucketHistogram{Boundaries: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000}, NoMinMax: false},
+			expAgg: metric.AggregationExplicitBucketHistogram{Boundaries: []float64{0, 5, 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2500, 5000, 7500, 10000}, NoMinMax: false},
 		},
 	} {
 		test := test

diff --git a/go.mod b/go.mod
@@ -103,7 +103,7 @@ require (
 	go.opentelemetry.io/otel v1.24.0
 	go.opentelemetry.io/otel/metric v1.24.0
 	go.opentelemetry.io/otel/sdk v1.24.0
-	go.opentelemetry.io/otel/sdk/metric v0.39.0
+	go.opentelemetry.io/otel/sdk/metric v1.24.0
 	go.opentelemetry.io/proto/otlp v1.0.0
 	go.uber.org/goleak v1.1.10
 	golang.org/x/crypto v0.26.0

diff --git a/go.sum b/go.sum
@@ -947,6 +947,8 @@ go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucg
 go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
 go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI=
 go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI=
+go.opentelemetry.io/otel/sdk/metric v1.24.0 h1:yyMQrPzF+k88/DbH7o4FMAs80puqd+9osbiBrJrz/w8=
+go.opentelemetry.io/otel/sdk/metric v1.24.0/go.mod h1:I6Y5FjH6rvEnTTAYQz3Mmv2kl6Ek5IIrmwTLqMrrOE0=
 go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ=
 go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY=
 go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=

diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod
@@ -11,7 +11,6 @@ require (
 	github.com/docker/go-connections v0.4.0
 	github.com/evanphx/json-patch v4.12.0+incompatible
 	github.com/go-jose/go-jose/v3 v3.0.3
-	github.com/hashicorp/consul v1.16.1
 	github.com/hashicorp/consul/api v1.29.4
 	github.com/hashicorp/consul/envoyextensions v0.7.3
 	github.com/hashicorp/consul/sdk v0.16.1