Merge pull request #1007 from openmeterio/refactor-kafka-metrics

refactor: mk Kafka metrics pkg public
openmeterio · Jun 13, 2024 · d8ffb7a · d8ffb7a
2 parents 7375634 + 31c9c8a
commit d8ffb7a
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 10 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -42,7 +42,6 @@ import (
 	"github.com/openmeterio/openmeter/internal/ingest/ingestdriver"
 	"github.com/openmeterio/openmeter/internal/ingest/kafkaingest"
 	"github.com/openmeterio/openmeter/internal/ingest/kafkaingest/serializer"
-	kafkametrics "github.com/openmeterio/openmeter/internal/kafka/metrics"
 	"github.com/openmeterio/openmeter/internal/meter"
 	"github.com/openmeterio/openmeter/internal/namespace"
 	"github.com/openmeterio/openmeter/internal/namespace/namespacedriver"
@@ -56,6 +55,7 @@ import (
 	"github.com/openmeterio/openmeter/pkg/framework/operation"
 	"github.com/openmeterio/openmeter/pkg/gosundheit"
 	pkgkafka "github.com/openmeterio/openmeter/pkg/kafka"
+	kafkametrics "github.com/openmeterio/openmeter/pkg/kafka/metrics"
 	"github.com/openmeterio/openmeter/pkg/models"
 	"github.com/openmeterio/openmeter/pkg/slicesx"
 )

diff --git a/internal/ingest/kafkaingest/collector.go b/internal/ingest/kafkaingest/collector.go
@@ -13,8 +13,8 @@ import (
 	"go.opentelemetry.io/otel/metric"
 
 	"github.com/openmeterio/openmeter/internal/ingest/kafkaingest/serializer"
-	kafkametrics "github.com/openmeterio/openmeter/internal/kafka/metrics"
-	kafkastats "github.com/openmeterio/openmeter/internal/kafka/metrics/stats"
+	kafkametrics "github.com/openmeterio/openmeter/pkg/kafka/metrics"
+	kafkastats "github.com/openmeterio/openmeter/pkg/kafka/metrics/stats"
 )
 
 // Collector is a receiver of events that handles sending those events to a downstream Kafka broker.

diff --git a/internal/sink/sink.go b/internal/sink/sink.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/openmeterio/openmeter/internal/dedupe"
 	"github.com/openmeterio/openmeter/internal/ingest/kafkaingest/serializer"
-	kafkametrics "github.com/openmeterio/openmeter/internal/kafka/metrics"
-	kafkastats "github.com/openmeterio/openmeter/internal/kafka/metrics/stats"
 	"github.com/openmeterio/openmeter/internal/meter"
+	kafkametrics "github.com/openmeterio/openmeter/pkg/kafka/metrics"
+	kafkastats "github.com/openmeterio/openmeter/pkg/kafka/metrics/stats"
 )
 
 var namespaceTopicRegexp = regexp.MustCompile(`^om_([A-Za-z0-9]+(?:_[A-Za-z0-9]+)*)_events$`)

diff --git a/openmeter/ingest/kafkaingest/collector.go b/openmeter/ingest/kafkaingest/collector.go
@@ -8,8 +8,8 @@ import (
 	"go.opentelemetry.io/otel/metric"
 
 	"github.com/openmeterio/openmeter/internal/ingest/kafkaingest"
-	kafkametrics "github.com/openmeterio/openmeter/internal/kafka/metrics"
 	"github.com/openmeterio/openmeter/openmeter/ingest/kafkaingest/serializer"
+	kafkametrics "github.com/openmeterio/openmeter/pkg/kafka/metrics"
 )
 
 // Collector is a receiver of events that handles sending those events to a downstream Kafka broker.

diff --git a/internal/kafka/metrics/broker.go → pkg/kafka/metrics/broker.go b/internal/kafka/metrics/broker.go → pkg/kafka/metrics/broker.go
@@ -7,7 +7,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 
-	"github.com/openmeterio/openmeter/internal/kafka/metrics/stats"
+	"github.com/openmeterio/openmeter/pkg/kafka/metrics/stats"
 )
 
 type BrokerMetrics struct {

diff --git a/internal/kafka/metrics/consumergroup.go → pkg/kafka/metrics/consumergroup.go b/internal/kafka/metrics/consumergroup.go → pkg/kafka/metrics/consumergroup.go
@@ -7,7 +7,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 
-	"github.com/openmeterio/openmeter/internal/kafka/metrics/stats"
+	"github.com/openmeterio/openmeter/pkg/kafka/metrics/stats"
 )
 
 type ConsumerGroupMetrics struct {

diff --git a/internal/kafka/metrics/metrics.go → pkg/kafka/metrics/metrics.go b/internal/kafka/metrics/metrics.go → pkg/kafka/metrics/metrics.go
@@ -7,7 +7,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 
-	"github.com/openmeterio/openmeter/internal/kafka/metrics/stats"
+	"github.com/openmeterio/openmeter/pkg/kafka/metrics/stats"
 )
 
 // Metrics stores set of Kafka client related metrics

diff --git a/internal/kafka/metrics/stats/broker.go → pkg/kafka/metrics/stats/broker.go b/internal/kafka/metrics/stats/broker.go → pkg/kafka/metrics/stats/broker.go
diff --git a/...rnal/kafka/metrics/stats/consumergroup.go → pkg/kafka/metrics/stats/consumergroup.go b/...rnal/kafka/metrics/stats/consumergroup.go → pkg/kafka/metrics/stats/consumergroup.go
diff --git a/internal/kafka/metrics/stats/stats.go → pkg/kafka/metrics/stats/stats.go b/internal/kafka/metrics/stats/stats.go → pkg/kafka/metrics/stats/stats.go
diff --git a/internal/kafka/metrics/stats/stats_test.go → pkg/kafka/metrics/stats/stats_test.go b/internal/kafka/metrics/stats/stats_test.go → pkg/kafka/metrics/stats/stats_test.go
diff --git a/...l/kafka/metrics/stats/testdata/stats.json → pkg/kafka/metrics/stats/testdata/stats.json b/...l/kafka/metrics/stats/testdata/stats.json → pkg/kafka/metrics/stats/testdata/stats.json
diff --git a/internal/kafka/metrics/stats/topic.go → pkg/kafka/metrics/stats/topic.go b/internal/kafka/metrics/stats/topic.go → pkg/kafka/metrics/stats/topic.go
diff --git a/internal/kafka/metrics/topic.go → pkg/kafka/metrics/topic.go b/internal/kafka/metrics/topic.go → pkg/kafka/metrics/topic.go
@@ -7,7 +7,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 
-	"github.com/openmeterio/openmeter/internal/kafka/metrics/stats"
+	"github.com/openmeterio/openmeter/pkg/kafka/metrics/stats"
 )
 
 type TopicMetrics struct {