diff --git a/internal/zero/api/api.go b/internal/zero/api/api.go index 1dc6c2550..d94f6a734 100644 --- a/internal/zero/api/api.go +++ b/internal/zero/api/api.go @@ -13,7 +13,7 @@ import ( connect_mux "github.com/pomerium/pomerium/internal/zero/connect-mux" "github.com/pomerium/pomerium/internal/zero/grpcconn" "github.com/pomerium/pomerium/internal/zero/healthcheck" - metrics_reporter "github.com/pomerium/pomerium/internal/zero/reporter" + metrics_reporter "github.com/pomerium/pomerium/internal/zero/telemetry/reporter" token_api "github.com/pomerium/pomerium/internal/zero/token" "github.com/pomerium/pomerium/pkg/fanout" cluster_api "github.com/pomerium/pomerium/pkg/zero/cluster" diff --git a/internal/zero/controller/controller.go b/internal/zero/controller/controller.go index 527644a24..8075958e4 100644 --- a/internal/zero/controller/controller.go +++ b/internal/zero/controller/controller.go @@ -12,13 +12,13 @@ import ( "golang.org/x/sync/errgroup" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/zero/analytics" sdk "github.com/pomerium/pomerium/internal/zero/api" "github.com/pomerium/pomerium/internal/zero/bootstrap" "github.com/pomerium/pomerium/internal/zero/healthcheck" "github.com/pomerium/pomerium/internal/zero/leaser" "github.com/pomerium/pomerium/internal/zero/reconciler" - "github.com/pomerium/pomerium/internal/zero/reporter" + "github.com/pomerium/pomerium/internal/zero/telemetry/analytics" + "github.com/pomerium/pomerium/internal/zero/telemetry/reporter" "github.com/pomerium/pomerium/pkg/cmd/pomerium" "github.com/pomerium/pomerium/pkg/grpc/databroker" ) diff --git a/internal/zero/analytics/activeusers.go b/internal/zero/telemetry/analytics/activeusers.go similarity index 100% rename from internal/zero/analytics/activeusers.go rename to internal/zero/telemetry/analytics/activeusers.go diff --git a/internal/zero/analytics/activeusers_test.go b/internal/zero/telemetry/analytics/activeusers_test.go similarity index 93% rename from internal/zero/analytics/activeusers_test.go rename to internal/zero/telemetry/analytics/activeusers_test.go index 226365159..585c452ab 100644 --- a/internal/zero/analytics/activeusers_test.go +++ b/internal/zero/telemetry/analytics/activeusers_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/pomerium/pomerium/internal/zero/analytics" + "github.com/pomerium/pomerium/internal/zero/telemetry/analytics" ) func TestActiveUsers(t *testing.T) { diff --git a/internal/zero/analytics/collector.go b/internal/zero/telemetry/analytics/collector.go similarity index 100% rename from internal/zero/analytics/collector.go rename to internal/zero/telemetry/analytics/collector.go diff --git a/internal/zero/analytics/metrics.go b/internal/zero/telemetry/analytics/metrics.go similarity index 100% rename from internal/zero/analytics/metrics.go rename to internal/zero/telemetry/analytics/metrics.go diff --git a/internal/zero/analytics/sessions.go b/internal/zero/telemetry/analytics/sessions.go similarity index 100% rename from internal/zero/analytics/sessions.go rename to internal/zero/telemetry/analytics/sessions.go diff --git a/internal/zero/analytics/storage.go b/internal/zero/telemetry/analytics/storage.go similarity index 100% rename from internal/zero/analytics/storage.go rename to internal/zero/telemetry/analytics/storage.go diff --git a/internal/zero/analytics/storage_test.go b/internal/zero/telemetry/analytics/storage_test.go similarity index 89% rename from internal/zero/analytics/storage_test.go rename to internal/zero/telemetry/analytics/storage_test.go index 53868403f..860ce50ac 100644 --- a/internal/zero/analytics/storage_test.go +++ b/internal/zero/telemetry/analytics/storage_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/pomerium/pomerium/internal/zero/analytics" + "github.com/pomerium/pomerium/internal/zero/telemetry/analytics" ) func TestStorage(t *testing.T) { diff --git a/internal/zero/reporter/convert/convert.go b/internal/zero/telemetry/prometheus/convert.go similarity index 97% rename from internal/zero/reporter/convert/convert.go rename to internal/zero/telemetry/prometheus/convert.go index 5833ad68f..ecb720182 100644 --- a/internal/zero/reporter/convert/convert.go +++ b/internal/zero/telemetry/prometheus/convert.go @@ -1,4 +1,4 @@ -package convert +package prometheus import ( "errors" @@ -19,10 +19,10 @@ type FilterFn func(metricname string) (string, bool) // returns the new attribute name and true if the attribute should be included type RelabelFn func(metricname string) (string, bool) -// PrometheusToOTLP converts a prometheus metric stream to OTLP metrics +// ToOTLP converts a prometheus metric stream to OTLP metrics // the filter function is used to filter out unwanted metrics // the relabel function is used to relabel metric attributes -func PrometheusToOTLP( +func ToOTLP( src io.Reader, filter FilterFn, relabel RelabelFn, diff --git a/internal/zero/reporter/convert/convert_test.go b/internal/zero/telemetry/prometheus/convert_test.go similarity index 96% rename from internal/zero/reporter/convert/convert_test.go rename to internal/zero/telemetry/prometheus/convert_test.go index 7a46f737c..147613a86 100644 --- a/internal/zero/reporter/convert/convert_test.go +++ b/internal/zero/telemetry/prometheus/convert_test.go @@ -1,4 +1,4 @@ -package convert_test +package prometheus_test import ( "embed" @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/sdk/metric/metricdata" - "github.com/pomerium/pomerium/internal/zero/reporter/convert" + "github.com/pomerium/pomerium/internal/zero/telemetry/prometheus" ) //go:embed testdata @@ -105,7 +105,7 @@ func TestConvert(t *testing.T) { require.NoError(t, err) defer fd.Close() - got, err := convert.PrometheusToOTLP(fd, + got, err := prometheus.ToOTLP(fd, func(name string) (string, bool) { return name, true }, func(label string) (string, bool) { diff --git a/internal/zero/reporter/convert/stream.go b/internal/zero/telemetry/prometheus/stream.go similarity index 98% rename from internal/zero/reporter/convert/stream.go rename to internal/zero/telemetry/prometheus/stream.go index c2352277c..f73baaca8 100644 --- a/internal/zero/reporter/convert/stream.go +++ b/internal/zero/telemetry/prometheus/stream.go @@ -1,4 +1,4 @@ -package convert +package prometheus import ( "bufio" diff --git a/internal/zero/reporter/convert/stream_test.go b/internal/zero/telemetry/prometheus/stream_test.go similarity index 94% rename from internal/zero/reporter/convert/stream_test.go rename to internal/zero/telemetry/prometheus/stream_test.go index eba61c1fa..830d8ced0 100644 --- a/internal/zero/reporter/convert/stream_test.go +++ b/internal/zero/telemetry/prometheus/stream_test.go @@ -1,4 +1,4 @@ -package convert_test +package prometheus_test import ( "errors" @@ -13,7 +13,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" - "github.com/pomerium/pomerium/internal/zero/reporter/convert" + "github.com/pomerium/pomerium/internal/zero/telemetry/prometheus" ) func TestMetricFamilyStream(t *testing.T) { @@ -89,7 +89,7 @@ cpu_seconds_total 12345.6 for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { reader := strings.NewReader(tt.input) - metricStream := convert.NewMetricFamilyStream(reader) + metricStream := prometheus.NewMetricFamilyStream(reader) var got []*dto.MetricFamily for { diff --git a/internal/zero/reporter/convert/testdata/counter.txt b/internal/zero/telemetry/prometheus/testdata/counter.txt similarity index 100% rename from internal/zero/reporter/convert/testdata/counter.txt rename to internal/zero/telemetry/prometheus/testdata/counter.txt diff --git a/internal/zero/reporter/convert/testdata/histogram.txt b/internal/zero/telemetry/prometheus/testdata/histogram.txt similarity index 100% rename from internal/zero/reporter/convert/testdata/histogram.txt rename to internal/zero/telemetry/prometheus/testdata/histogram.txt diff --git a/internal/zero/reporter/config.go b/internal/zero/telemetry/reporter/config.go similarity index 100% rename from internal/zero/reporter/config.go rename to internal/zero/telemetry/reporter/config.go diff --git a/internal/zero/reporter/reporter.go b/internal/zero/telemetry/reporter/reporter.go similarity index 100% rename from internal/zero/reporter/reporter.go rename to internal/zero/telemetry/reporter/reporter.go