From efd8b48793a1eb90256c4ac29627b8ed45ee7864 Mon Sep 17 00:00:00 2001 From: Marc Tuduri Date: Tue, 18 Feb 2025 12:00:41 +0100 Subject: [PATCH] Move filter package to pkg to be public --- pkg/beyla/config.go | 2 +- pkg/{internal => }/filter/attribute.go | 0 pkg/{internal => }/filter/attribute_test.go | 0 pkg/{internal => }/filter/matcher.go | 0 pkg/{internal => }/filter/matcher_test.go | 0 pkg/internal/netolly/agent/pipeline.go | 2 +- pkg/internal/netolly/agent/pipeline_test.go | 2 +- pkg/internal/pipe/instrumenter.go | 2 +- pkg/internal/pipe/instrumenter_test.go | 2 +- 9 files changed, 5 insertions(+), 5 deletions(-) rename pkg/{internal => }/filter/attribute.go (100%) rename pkg/{internal => }/filter/attribute_test.go (100%) rename pkg/{internal => }/filter/matcher.go (100%) rename pkg/{internal => }/filter/matcher_test.go (100%) diff --git a/pkg/beyla/config.go b/pkg/beyla/config.go index 0e2ed3ef8..0a6c6aa62 100644 --- a/pkg/beyla/config.go +++ b/pkg/beyla/config.go @@ -17,8 +17,8 @@ import ( "github.com/grafana/beyla/v2/pkg/export/instrumentations" "github.com/grafana/beyla/v2/pkg/export/otel" "github.com/grafana/beyla/v2/pkg/export/prom" + "github.com/grafana/beyla/v2/pkg/filter" "github.com/grafana/beyla/v2/pkg/internal/ebpf/tcmanager" - "github.com/grafana/beyla/v2/pkg/internal/filter" "github.com/grafana/beyla/v2/pkg/internal/imetrics" "github.com/grafana/beyla/v2/pkg/internal/infraolly/process" "github.com/grafana/beyla/v2/pkg/internal/kube" diff --git a/pkg/internal/filter/attribute.go b/pkg/filter/attribute.go similarity index 100% rename from pkg/internal/filter/attribute.go rename to pkg/filter/attribute.go diff --git a/pkg/internal/filter/attribute_test.go b/pkg/filter/attribute_test.go similarity index 100% rename from pkg/internal/filter/attribute_test.go rename to pkg/filter/attribute_test.go diff --git a/pkg/internal/filter/matcher.go b/pkg/filter/matcher.go similarity index 100% rename from pkg/internal/filter/matcher.go rename to pkg/filter/matcher.go diff --git a/pkg/internal/filter/matcher_test.go b/pkg/filter/matcher_test.go similarity index 100% rename from pkg/internal/filter/matcher_test.go rename to pkg/filter/matcher_test.go diff --git a/pkg/internal/netolly/agent/pipeline.go b/pkg/internal/netolly/agent/pipeline.go index 6599fdf5b..73aae2bf9 100644 --- a/pkg/internal/netolly/agent/pipeline.go +++ b/pkg/internal/netolly/agent/pipeline.go @@ -7,7 +7,7 @@ import ( "github.com/grafana/beyla/v2/pkg/export/otel" "github.com/grafana/beyla/v2/pkg/export/prom" - "github.com/grafana/beyla/v2/pkg/internal/filter" + "github.com/grafana/beyla/v2/pkg/filter" "github.com/grafana/beyla/v2/pkg/internal/netolly/ebpf" "github.com/grafana/beyla/v2/pkg/internal/netolly/export" "github.com/grafana/beyla/v2/pkg/internal/netolly/flow" diff --git a/pkg/internal/netolly/agent/pipeline_test.go b/pkg/internal/netolly/agent/pipeline_test.go index 09ea5b09f..89cae163b 100644 --- a/pkg/internal/netolly/agent/pipeline_test.go +++ b/pkg/internal/netolly/agent/pipeline_test.go @@ -16,8 +16,8 @@ import ( "github.com/grafana/beyla/v2/pkg/export/attributes" "github.com/grafana/beyla/v2/pkg/export/otel" "github.com/grafana/beyla/v2/pkg/export/prom" + "github.com/grafana/beyla/v2/pkg/filter" "github.com/grafana/beyla/v2/pkg/internal/connector" - "github.com/grafana/beyla/v2/pkg/internal/filter" "github.com/grafana/beyla/v2/pkg/internal/netolly/ebpf" "github.com/grafana/beyla/v2/pkg/internal/netolly/flow/transport" "github.com/grafana/beyla/v2/pkg/internal/pipe/global" diff --git a/pkg/internal/pipe/instrumenter.go b/pkg/internal/pipe/instrumenter.go index 807f3584e..9929209df 100644 --- a/pkg/internal/pipe/instrumenter.go +++ b/pkg/internal/pipe/instrumenter.go @@ -12,7 +12,7 @@ import ( "github.com/grafana/beyla/v2/pkg/export/debug" "github.com/grafana/beyla/v2/pkg/export/otel" "github.com/grafana/beyla/v2/pkg/export/prom" - "github.com/grafana/beyla/v2/pkg/internal/filter" + "github.com/grafana/beyla/v2/pkg/filter" "github.com/grafana/beyla/v2/pkg/internal/imetrics" "github.com/grafana/beyla/v2/pkg/internal/pipe/global" "github.com/grafana/beyla/v2/pkg/internal/request" diff --git a/pkg/internal/pipe/instrumenter_test.go b/pkg/internal/pipe/instrumenter_test.go index 763e55005..582da61d6 100644 --- a/pkg/internal/pipe/instrumenter_test.go +++ b/pkg/internal/pipe/instrumenter_test.go @@ -20,7 +20,7 @@ import ( attr "github.com/grafana/beyla/v2/pkg/export/attributes/names" "github.com/grafana/beyla/v2/pkg/export/instrumentations" "github.com/grafana/beyla/v2/pkg/export/otel" - "github.com/grafana/beyla/v2/pkg/internal/filter" + "github.com/grafana/beyla/v2/pkg/filter" "github.com/grafana/beyla/v2/pkg/internal/imetrics" "github.com/grafana/beyla/v2/pkg/internal/kube" "github.com/grafana/beyla/v2/pkg/internal/pipe/global"