diff --git a/authorize/check_response.go b/authorize/check_response.go index 2990f0a11..8ed0a85b7 100644 --- a/authorize/check_response.go +++ b/authorize/check_response.go @@ -22,9 +22,9 @@ import ( "github.com/pomerium/pomerium/authorize/evaluator" "github.com/pomerium/pomerium/internal/httputil" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/pkg/policy/criteria" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" "github.com/pomerium/pomerium/pkg/webauthnutil" ) diff --git a/authorize/check_response_test.go b/authorize/check_response_test.go index 69200a37e..9b171eafe 100644 --- a/authorize/check_response_test.go +++ b/authorize/check_response_test.go @@ -16,10 +16,10 @@ import ( "github.com/pomerium/pomerium/authorize/internal/store" "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/internal/atomicutil" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/internal/testutil" hpke_handlers "github.com/pomerium/pomerium/pkg/hpke/handlers" "github.com/pomerium/pomerium/pkg/policy/criteria" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) func TestAuthorize_handleResult(t *testing.T) { diff --git a/authorize/grpc.go b/authorize/grpc.go index 6d9994802..f9c05b7b8 100644 --- a/authorize/grpc.go +++ b/authorize/grpc.go @@ -17,12 +17,12 @@ import ( "github.com/pomerium/pomerium/internal/httputil" "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/sessions" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/pkg/contextutil" "github.com/pomerium/pomerium/pkg/grpc/user" "github.com/pomerium/pomerium/pkg/storage" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) // Check implements the envoy auth server gRPC endpoint. diff --git a/authorize/log.go b/authorize/log.go index a530e8a6a..8e220ce96 100644 --- a/authorize/log.go +++ b/authorize/log.go @@ -10,7 +10,6 @@ import ( "github.com/pomerium/pomerium/authorize/evaluator" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/grpc/audit" "github.com/pomerium/pomerium/pkg/grpc/databroker" @@ -18,6 +17,7 @@ import ( "github.com/pomerium/pomerium/pkg/grpc/user" "github.com/pomerium/pomerium/pkg/grpcutil" "github.com/pomerium/pomerium/pkg/storage" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) func (a *Authorize) logAuthorizeCheck( diff --git a/authorize/log_test.go b/authorize/log_test.go index b20c3c573..a9cbd98f5 100644 --- a/authorize/log_test.go +++ b/authorize/log_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/pkg/grpc/session" "github.com/pomerium/pomerium/pkg/grpc/user" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) func Test_populateLogEvent(t *testing.T) { diff --git a/internal/controlplane/http.go b/internal/controlplane/http.go index f1749d980..840f42ab1 100644 --- a/internal/controlplane/http.go +++ b/internal/controlplane/http.go @@ -14,9 +14,9 @@ import ( "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/middleware" "github.com/pomerium/pomerium/internal/telemetry" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/internal/urlutil" hpke_handlers "github.com/pomerium/pomerium/pkg/hpke/handlers" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) func (srv *Server) addHTTPMiddleware(root *mux.Router, _ *config.Config) { diff --git a/internal/controlplane/server.go b/internal/controlplane/server.go index cbdf92a0f..f80760097 100644 --- a/internal/controlplane/server.go +++ b/internal/controlplane/server.go @@ -26,7 +26,6 @@ import ( "github.com/pomerium/pomerium/internal/httputil/reproxy" "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/telemetry" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/internal/version" @@ -34,6 +33,7 @@ import ( pom_grpc "github.com/pomerium/pomerium/pkg/grpc" "github.com/pomerium/pomerium/pkg/grpcutil" "github.com/pomerium/pomerium/pkg/httputil" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) // A Service can be mounted on the control plane. diff --git a/internal/httputil/client.go b/internal/httputil/client.go index b3f158065..73d3cd1c5 100644 --- a/internal/httputil/client.go +++ b/internal/httputil/client.go @@ -15,8 +15,8 @@ import ( "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/telemetry/metrics" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/internal/tripper" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) // ErrTokenRevoked signifies a token revocation or expiration error diff --git a/internal/httputil/client_test.go b/internal/httputil/client_test.go index 5967b84e8..cbc6a7b47 100644 --- a/internal/httputil/client_test.go +++ b/internal/httputil/client_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "github.com/pomerium/pomerium/internal/telemetry/requestid" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) func TestDefaultClient(t *testing.T) { diff --git a/internal/httputil/errors.go b/internal/httputil/errors.go index 3b4408913..35e6d01d9 100644 --- a/internal/httputil/errors.go +++ b/internal/httputil/errors.go @@ -6,8 +6,8 @@ import ( "net/url" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/pkg/contextutil" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" "github.com/pomerium/pomerium/ui" ) diff --git a/internal/log/middleware.go b/internal/log/middleware.go index c30168dc9..c59880a9a 100644 --- a/internal/log/middleware.go +++ b/internal/log/middleware.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" "github.com/pomerium/pomerium/internal/middleware/responsewriter" - "github.com/pomerium/pomerium/internal/telemetry/requestid" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) // NewHandler injects log into requests context. diff --git a/internal/log/middleware_test.go b/internal/log/middleware_test.go index 2a2dc1c6b..829c27cd7 100644 --- a/internal/log/middleware_test.go +++ b/internal/log/middleware_test.go @@ -12,7 +12,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/rs/zerolog" - "github.com/pomerium/pomerium/internal/telemetry/requestid" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) func decodeIfBinary(out fmt.Stringer) string { diff --git a/pkg/grpc/client.go b/pkg/grpc/client.go index 5ebbf289a..261fe10b8 100644 --- a/pkg/grpc/client.go +++ b/pkg/grpc/client.go @@ -12,8 +12,8 @@ import ( "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/telemetry" - "github.com/pomerium/pomerium/internal/telemetry/requestid" "github.com/pomerium/pomerium/pkg/grpcutil" + "github.com/pomerium/pomerium/pkg/telemetry/requestid" ) // Options contains options for connecting to a pomerium rpc service. diff --git a/internal/telemetry/requestid/grpc_client.go b/pkg/telemetry/requestid/grpc_client.go similarity index 100% rename from internal/telemetry/requestid/grpc_client.go rename to pkg/telemetry/requestid/grpc_client.go diff --git a/internal/telemetry/requestid/grpc_server.go b/pkg/telemetry/requestid/grpc_server.go similarity index 100% rename from internal/telemetry/requestid/grpc_server.go rename to pkg/telemetry/requestid/grpc_server.go diff --git a/internal/telemetry/requestid/http.go b/pkg/telemetry/requestid/http.go similarity index 100% rename from internal/telemetry/requestid/http.go rename to pkg/telemetry/requestid/http.go diff --git a/internal/telemetry/requestid/requestid.go b/pkg/telemetry/requestid/requestid.go similarity index 100% rename from internal/telemetry/requestid/requestid.go rename to pkg/telemetry/requestid/requestid.go diff --git a/internal/telemetry/requestid/requestid_test.go b/pkg/telemetry/requestid/requestid_test.go similarity index 100% rename from internal/telemetry/requestid/requestid_test.go rename to pkg/telemetry/requestid/requestid_test.go