diff --git a/authenticate/authenticate.go b/authenticate/authenticate.go index 7cf18f0ab..9f56c6470 100644 --- a/authenticate/authenticate.go +++ b/authenticate/authenticate.go @@ -10,8 +10,8 @@ import ( "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/internal/atomicutil" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/cryptutil" + "github.com/pomerium/pomerium/pkg/telemetry/trace" oteltrace "go.opentelemetry.io/otel/trace" ) diff --git a/authenticate/handlers.go b/authenticate/handlers.go index 5c54a806e..fe99d5c29 100644 --- a/authenticate/handlers.go +++ b/authenticate/handlers.go @@ -25,11 +25,11 @@ import ( "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/middleware" "github.com/pomerium/pomerium/internal/sessions" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/identity" "github.com/pomerium/pomerium/pkg/identity/oidc" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // Handler returns the authenticate service's handler chain. diff --git a/authorize/authorize.go b/authorize/authorize.go index f6ed77525..701113fed 100644 --- a/authorize/authorize.go +++ b/authorize/authorize.go @@ -18,10 +18,10 @@ import ( "github.com/pomerium/pomerium/internal/atomicutil" "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/telemetry/metrics" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/grpc/databroker" "github.com/pomerium/pomerium/pkg/storage" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // Authorize struct holds diff --git a/authorize/evaluator/evaluator.go b/authorize/evaluator/evaluator.go index e5fd9501d..0d13f166c 100644 --- a/authorize/evaluator/evaluator.go +++ b/authorize/evaluator/evaluator.go @@ -19,10 +19,10 @@ import ( "github.com/pomerium/pomerium/internal/errgrouputil" "github.com/pomerium/pomerium/internal/httputil" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/contextutil" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/policy/criteria" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // Request contains the inputs needed for evaluation. diff --git a/authorize/evaluator/headers_evaluator.go b/authorize/evaluator/headers_evaluator.go index 4eaf32a06..0ed71863a 100644 --- a/authorize/evaluator/headers_evaluator.go +++ b/authorize/evaluator/headers_evaluator.go @@ -9,7 +9,7 @@ import ( "github.com/pomerium/pomerium/authorize/internal/store" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // HeadersResponse is the output from the headers.rego script. diff --git a/authorize/evaluator/policy_evaluator.go b/authorize/evaluator/policy_evaluator.go index 56a4f228d..f13c38481 100644 --- a/authorize/evaluator/policy_evaluator.go +++ b/authorize/evaluator/policy_evaluator.go @@ -11,11 +11,11 @@ import ( "github.com/pomerium/pomerium/authorize/internal/store" "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/contextutil" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/policy" "github.com/pomerium/pomerium/pkg/policy/criteria" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // PolicyRequest is the input to policy evaluation. diff --git a/authorize/internal/store/store.go b/authorize/internal/store/store.go index 34f2c3676..6ea2426cb 100644 --- a/authorize/internal/store/store.go +++ b/authorize/internal/store/store.go @@ -21,9 +21,9 @@ import ( "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/grpc/databroker" "github.com/pomerium/pomerium/pkg/storage" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // A Store stores data for the OPA rego policy evaluation. diff --git a/cmd/pomerium/main.go b/cmd/pomerium/main.go index 3289a4391..f277ed5be 100644 --- a/cmd/pomerium/main.go +++ b/cmd/pomerium/main.go @@ -12,13 +12,13 @@ import ( "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/version" _ "github.com/pomerium/pomerium/internal/zero/bootstrap/writers/filesystem" _ "github.com/pomerium/pomerium/internal/zero/bootstrap/writers/k8s" zero_cmd "github.com/pomerium/pomerium/internal/zero/cmd" "github.com/pomerium/pomerium/pkg/cmd/pomerium" "github.com/pomerium/pomerium/pkg/envoy/files" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) func main() { diff --git a/config/envoyconfig/bootstrap.go b/config/envoyconfig/bootstrap.go index 4e1e5228c..6e2401415 100644 --- a/config/envoyconfig/bootstrap.go +++ b/config/envoyconfig/bootstrap.go @@ -19,7 +19,7 @@ import ( "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/config/otelconfig" "github.com/pomerium/pomerium/internal/telemetry" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/structpb" ) diff --git a/config/envoyconfig/clusters.go b/config/envoyconfig/clusters.go index bfb083cc5..be095e3fe 100644 --- a/config/envoyconfig/clusters.go +++ b/config/envoyconfig/clusters.go @@ -20,8 +20,8 @@ import ( "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/urlutil" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // BuildClusters builds envoy clusters from the given config. diff --git a/config/envoyconfig/listeners.go b/config/envoyconfig/listeners.go index e02b39e3e..c8676ee38 100644 --- a/config/envoyconfig/listeners.go +++ b/config/envoyconfig/listeners.go @@ -9,7 +9,7 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" "github.com/pomerium/pomerium/config" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) const listenerBufferLimit uint32 = 32 * 1024 diff --git a/config/envoyconfig/route_configurations.go b/config/envoyconfig/route_configurations.go index 9881e7322..dbf67a8fa 100644 --- a/config/envoyconfig/route_configurations.go +++ b/config/envoyconfig/route_configurations.go @@ -11,8 +11,8 @@ import ( "google.golang.org/protobuf/types/known/wrapperspb" "github.com/pomerium/pomerium/config" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/urlutil" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // BuildRouteConfigurations builds the route configurations for the RDS service. diff --git a/config/envoyconfig/tracing.go b/config/envoyconfig/tracing.go index 042108d93..a86b20788 100644 --- a/config/envoyconfig/tracing.go +++ b/config/envoyconfig/tracing.go @@ -17,7 +17,7 @@ import ( extensions_uuidx "github.com/pomerium/envoy-custom/api/extensions/request_id/uuidx" extensions_pomerium_otel "github.com/pomerium/envoy-custom/api/extensions/tracers/pomerium_otel" "github.com/pomerium/pomerium/config/otelconfig" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/databroker/cache.go b/databroker/cache.go index a0f55c2c0..522291822 100644 --- a/databroker/cache.go +++ b/databroker/cache.go @@ -19,7 +19,6 @@ import ( "github.com/pomerium/pomerium/internal/atomicutil" "github.com/pomerium/pomerium/internal/events" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/version" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/envoy/files" @@ -28,6 +27,7 @@ import ( "github.com/pomerium/pomerium/pkg/grpcutil" "github.com/pomerium/pomerium/pkg/identity" "github.com/pomerium/pomerium/pkg/identity/manager" + "github.com/pomerium/pomerium/pkg/telemetry/trace" oteltrace "go.opentelemetry.io/otel/trace" ) diff --git a/internal/authenticateflow/authenticateflow.go b/internal/authenticateflow/authenticateflow.go index 2fd7edafe..3e6dcc6d8 100644 --- a/internal/authenticateflow/authenticateflow.go +++ b/internal/authenticateflow/authenticateflow.go @@ -14,10 +14,10 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/structpb" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/grpc" "github.com/pomerium/pomerium/pkg/grpc/user" "github.com/pomerium/pomerium/pkg/identity" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // timeNow is time.Now but pulled out as a variable for tests. diff --git a/internal/authenticateflow/stateful.go b/internal/authenticateflow/stateful.go index 58d62d516..cf7c4bb2c 100644 --- a/internal/authenticateflow/stateful.go +++ b/internal/authenticateflow/stateful.go @@ -23,7 +23,6 @@ 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/trace" "github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/grpc" @@ -33,6 +32,7 @@ import ( "github.com/pomerium/pomerium/pkg/grpcutil" "github.com/pomerium/pomerium/pkg/identity" "github.com/pomerium/pomerium/pkg/identity/manager" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // Stateful implements the stateful authentication flow. In this flow, the diff --git a/internal/authenticateflow/stateless.go b/internal/authenticateflow/stateless.go index ef188eae9..dcb22cdca 100644 --- a/internal/authenticateflow/stateless.go +++ b/internal/authenticateflow/stateless.go @@ -21,7 +21,6 @@ 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/trace" "github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/grpc" @@ -31,6 +30,7 @@ import ( "github.com/pomerium/pomerium/pkg/grpc/user" "github.com/pomerium/pomerium/pkg/hpke" "github.com/pomerium/pomerium/pkg/identity" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel" oteltrace "go.opentelemetry.io/otel/trace" diff --git a/internal/controlplane/http.go b/internal/controlplane/http.go index 8f01e5881..e6091cf97 100644 --- a/internal/controlplane/http.go +++ b/internal/controlplane/http.go @@ -17,10 +17,10 @@ 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/trace" "github.com/pomerium/pomerium/internal/urlutil" hpke_handlers "github.com/pomerium/pomerium/pkg/hpke/handlers" "github.com/pomerium/pomerium/pkg/telemetry/requestid" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) func (srv *Server) addHTTPMiddleware(ctx context.Context, root *mux.Router, _ *config.Config) { diff --git a/internal/controlplane/server.go b/internal/controlplane/server.go index 9de4e29f4..ba58b5711 100644 --- a/internal/controlplane/server.go +++ b/internal/controlplane/server.go @@ -28,7 +28,6 @@ import ( "github.com/pomerium/pomerium/internal/events" "github.com/pomerium/pomerium/internal/httputil/reproxy" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/internal/version" "github.com/pomerium/pomerium/pkg/envoy/files" @@ -36,6 +35,7 @@ import ( "github.com/pomerium/pomerium/pkg/grpcutil" "github.com/pomerium/pomerium/pkg/httputil" "github.com/pomerium/pomerium/pkg/telemetry/requestid" + "github.com/pomerium/pomerium/pkg/telemetry/trace" oteltrace "go.opentelemetry.io/otel/trace" ) diff --git a/internal/databroker/config_source.go b/internal/databroker/config_source.go index 403bcf481..fbaabbcbe 100644 --- a/internal/databroker/config_source.go +++ b/internal/databroker/config_source.go @@ -15,13 +15,13 @@ import ( "github.com/pomerium/pomerium/internal/hashutil" "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/telemetry/metrics" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/grpc" configpb "github.com/pomerium/pomerium/pkg/grpc/config" "github.com/pomerium/pomerium/pkg/grpc/databroker" "github.com/pomerium/pomerium/pkg/grpcutil" "github.com/pomerium/pomerium/pkg/health" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" oteltrace "go.opentelemetry.io/otel/trace" googlegrpc "google.golang.org/grpc" diff --git a/internal/databroker/server.go b/internal/databroker/server.go index 863a0f9d3..61b72c66b 100644 --- a/internal/databroker/server.go +++ b/internal/databroker/server.go @@ -17,11 +17,11 @@ import ( "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/registry" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/grpc/databroker" "github.com/pomerium/pomerium/pkg/storage" "github.com/pomerium/pomerium/pkg/storage/inmemory" "github.com/pomerium/pomerium/pkg/storage/postgres" + "github.com/pomerium/pomerium/pkg/telemetry/trace" oteltrace "go.opentelemetry.io/otel/trace" ) diff --git a/internal/testenv/environment.go b/internal/testenv/environment.go index 8b16f99ea..dce233b2a 100644 --- a/internal/testenv/environment.go +++ b/internal/testenv/environment.go @@ -38,7 +38,6 @@ import ( "github.com/pomerium/pomerium/config/otelconfig" databroker_service "github.com/pomerium/pomerium/databroker" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/testenv/envutil" "github.com/pomerium/pomerium/internal/testenv/values" "github.com/pomerium/pomerium/internal/version" @@ -49,6 +48,7 @@ import ( "github.com/pomerium/pomerium/pkg/identity/manager" "github.com/pomerium/pomerium/pkg/netutil" "github.com/pomerium/pomerium/pkg/slices" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/testenv/selftests/tracing_test.go b/internal/testenv/selftests/tracing_test.go index 8e29bb1e4..3fdd9e515 100644 --- a/internal/testenv/selftests/tracing_test.go +++ b/internal/testenv/selftests/tracing_test.go @@ -21,12 +21,12 @@ import ( oteltrace "go.opentelemetry.io/otel/trace" "github.com/pomerium/pomerium/config" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/testenv" "github.com/pomerium/pomerium/internal/testenv/scenarios" "github.com/pomerium/pomerium/internal/testenv/snippets" "github.com/pomerium/pomerium/internal/testenv/upstreams" . "github.com/pomerium/pomerium/internal/testutil/tracetest" //nolint:revive + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) var allServices = []string{ diff --git a/internal/testenv/snippets/wait.go b/internal/testenv/snippets/wait.go index eb44ea36c..77204fc30 100644 --- a/internal/testenv/snippets/wait.go +++ b/internal/testenv/snippets/wait.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/testenv" "github.com/pomerium/pomerium/pkg/grpcutil" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/testenv/upstreams/grpc.go b/internal/testenv/upstreams/grpc.go index c6c203586..115718982 100644 --- a/internal/testenv/upstreams/grpc.go +++ b/internal/testenv/upstreams/grpc.go @@ -6,10 +6,10 @@ import ( "net" "strings" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/testenv" "github.com/pomerium/pomerium/internal/testenv/snippets" "github.com/pomerium/pomerium/internal/testenv/values" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" oteltrace "go.opentelemetry.io/otel/trace" "google.golang.org/grpc" diff --git a/internal/testenv/upstreams/http.go b/internal/testenv/upstreams/http.go index 8d97d61e3..36763ee40 100644 --- a/internal/testenv/upstreams/http.go +++ b/internal/testenv/upstreams/http.go @@ -17,10 +17,10 @@ import ( "github.com/gorilla/mux" "github.com/gorilla/websocket" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/testenv" "github.com/pomerium/pomerium/internal/testenv/snippets" "github.com/pomerium/pomerium/internal/testenv/values" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" "go.opentelemetry.io/otel/attribute" diff --git a/internal/testenv/upstreams/tcp.go b/internal/testenv/upstreams/tcp.go index 6eab5b629..7d00feee0 100644 --- a/internal/testenv/upstreams/tcp.go +++ b/internal/testenv/upstreams/tcp.go @@ -13,9 +13,9 @@ import ( "net/url" "sync" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/testenv" "github.com/pomerium/pomerium/internal/testenv/values" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "go.opentelemetry.io/otel/attribute" oteltrace "go.opentelemetry.io/otel/trace" "golang.org/x/net/http2" diff --git a/internal/testutil/minio.go b/internal/testutil/minio.go index 2b0d7e57e..559e35776 100644 --- a/internal/testutil/minio.go +++ b/internal/testutil/minio.go @@ -6,7 +6,7 @@ import ( "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" oteltrace "go.opentelemetry.io/otel/trace" diff --git a/internal/testutil/postgres.go b/internal/testutil/postgres.go index 15bb70826..77d8d8045 100644 --- a/internal/testutil/postgres.go +++ b/internal/testutil/postgres.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/jackc/pgx/v5" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" oteltrace "go.opentelemetry.io/otel/trace" diff --git a/internal/testutil/tracetest/tracing.go b/internal/testutil/tracetest/tracing.go index 06db43f62..3ccb29119 100644 --- a/internal/testutil/tracetest/tracing.go +++ b/internal/testutil/tracetest/tracing.go @@ -16,7 +16,7 @@ import ( "unique" gocmp "github.com/google/go-cmp/cmp" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" oteltrace "go.opentelemetry.io/otel/trace" diff --git a/pkg/cmd/pomerium/pomerium.go b/pkg/cmd/pomerium/pomerium.go index e87a2fb6a..b26a41285 100644 --- a/pkg/cmd/pomerium/pomerium.go +++ b/pkg/cmd/pomerium/pomerium.go @@ -23,11 +23,11 @@ import ( "github.com/pomerium/pomerium/internal/events" "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/registry" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/version" derivecert_config "github.com/pomerium/pomerium/pkg/derivecert/config" "github.com/pomerium/pomerium/pkg/envoy" "github.com/pomerium/pomerium/pkg/envoy/files" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/pomerium/pomerium/proxy" oteltrace "go.opentelemetry.io/otel/trace" ) diff --git a/pkg/identity/oidc/oidc.go b/pkg/identity/oidc/oidc.go index 41148834a..75950d013 100644 --- a/pkg/identity/oidc/oidc.go +++ b/pkg/identity/oidc/oidc.go @@ -16,11 +16,11 @@ import ( "golang.org/x/oauth2" "github.com/pomerium/pomerium/internal/httputil" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/internal/version" "github.com/pomerium/pomerium/pkg/identity/identity" "github.com/pomerium/pomerium/pkg/identity/oauth" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // Name identifies the generic OpenID Connect provider. diff --git a/internal/telemetry/trace/carriers.go b/pkg/telemetry/trace/carriers.go similarity index 100% rename from internal/telemetry/trace/carriers.go rename to pkg/telemetry/trace/carriers.go diff --git a/internal/telemetry/trace/carriers_test.go b/pkg/telemetry/trace/carriers_test.go similarity index 91% rename from internal/telemetry/trace/carriers_test.go rename to pkg/telemetry/trace/carriers_test.go index 1e63df4b6..ff5d491fb 100644 --- a/internal/telemetry/trace/carriers_test.go +++ b/pkg/telemetry/trace/carriers_test.go @@ -4,7 +4,7 @@ import ( "net/url" "testing" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/stretchr/testify/assert" ) diff --git a/internal/telemetry/trace/client.go b/pkg/telemetry/trace/client.go similarity index 100% rename from internal/telemetry/trace/client.go rename to pkg/telemetry/trace/client.go diff --git a/internal/telemetry/trace/client_test.go b/pkg/telemetry/trace/client_test.go similarity index 99% rename from internal/telemetry/trace/client_test.go rename to pkg/telemetry/trace/client_test.go index ec4771048..026eb16ee 100644 --- a/internal/telemetry/trace/client_test.go +++ b/pkg/telemetry/trace/client_test.go @@ -13,13 +13,13 @@ import ( "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/internal/log" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/testenv" "github.com/pomerium/pomerium/internal/testenv/scenarios" "github.com/pomerium/pomerium/internal/testenv/snippets" . "github.com/pomerium/pomerium/internal/testutil/tracetest" //nolint:revive "github.com/pomerium/pomerium/internal/testutil/tracetest/mock_otlptrace" "github.com/pomerium/pomerium/internal/version" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" diff --git a/internal/telemetry/trace/debug.go b/pkg/telemetry/trace/debug.go similarity index 100% rename from internal/telemetry/trace/debug.go rename to pkg/telemetry/trace/debug.go diff --git a/internal/telemetry/trace/debug_test.go b/pkg/telemetry/trace/debug_test.go similarity index 99% rename from internal/telemetry/trace/debug_test.go rename to pkg/telemetry/trace/debug_test.go index 05c937c43..1bf62a7ad 100644 --- a/internal/telemetry/trace/debug_test.go +++ b/pkg/telemetry/trace/debug_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/pomerium/pomerium/internal/telemetry/trace" . "github.com/pomerium/pomerium/internal/testutil/tracetest" //nolint:revive + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/stretchr/testify/assert" sdktrace "go.opentelemetry.io/otel/sdk/trace" oteltrace "go.opentelemetry.io/otel/trace" diff --git a/internal/telemetry/trace/global.go b/pkg/telemetry/trace/global.go similarity index 100% rename from internal/telemetry/trace/global.go rename to pkg/telemetry/trace/global.go diff --git a/internal/telemetry/trace/global_test.go b/pkg/telemetry/trace/global_test.go similarity index 88% rename from internal/telemetry/trace/global_test.go rename to pkg/telemetry/trace/global_test.go index 852d2c82a..00f08338d 100644 --- a/internal/telemetry/trace/global_test.go +++ b/pkg/telemetry/trace/global_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace/noop" diff --git a/internal/telemetry/trace/main_test.go b/pkg/telemetry/trace/main_test.go similarity index 69% rename from internal/telemetry/trace/main_test.go rename to pkg/telemetry/trace/main_test.go index b546c8e45..dac0af9c0 100644 --- a/internal/telemetry/trace/main_test.go +++ b/pkg/telemetry/trace/main_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) func TestMain(m *testing.M) { diff --git a/internal/telemetry/trace/middleware.go b/pkg/telemetry/trace/middleware.go similarity index 100% rename from internal/telemetry/trace/middleware.go rename to pkg/telemetry/trace/middleware.go diff --git a/internal/telemetry/trace/middleware_test.go b/pkg/telemetry/trace/middleware_test.go similarity index 99% rename from internal/telemetry/trace/middleware_test.go rename to pkg/telemetry/trace/middleware_test.go index ff01cc4d2..7a1a66537 100644 --- a/internal/telemetry/trace/middleware_test.go +++ b/pkg/telemetry/trace/middleware_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/gorilla/mux" - "github.com/pomerium/pomerium/internal/telemetry/trace" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/stretchr/testify/assert" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" sdktrace "go.opentelemetry.io/otel/sdk/trace" diff --git a/internal/telemetry/trace/server.go b/pkg/telemetry/trace/server.go similarity index 100% rename from internal/telemetry/trace/server.go rename to pkg/telemetry/trace/server.go diff --git a/internal/telemetry/trace/trace.go b/pkg/telemetry/trace/trace.go similarity index 100% rename from internal/telemetry/trace/trace.go rename to pkg/telemetry/trace/trace.go diff --git a/internal/telemetry/trace/trace_export_test.go b/pkg/telemetry/trace/trace_export_test.go similarity index 100% rename from internal/telemetry/trace/trace_export_test.go rename to pkg/telemetry/trace/trace_export_test.go diff --git a/internal/telemetry/trace/util.go b/pkg/telemetry/trace/util.go similarity index 100% rename from internal/telemetry/trace/util.go rename to pkg/telemetry/trace/util.go diff --git a/proxy/handlers.go b/proxy/handlers.go index dda079a88..2013df2a4 100644 --- a/proxy/handlers.go +++ b/proxy/handlers.go @@ -15,8 +15,8 @@ import ( "github.com/pomerium/pomerium/internal/handlers" "github.com/pomerium/pomerium/internal/httputil" "github.com/pomerium/pomerium/internal/middleware" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/urlutil" + "github.com/pomerium/pomerium/pkg/telemetry/trace" ) // registerDashboardHandlers returns the proxy service's ServeMux diff --git a/proxy/proxy.go b/proxy/proxy.go index d48977e25..a6681da9f 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -19,9 +19,9 @@ import ( "github.com/pomerium/pomerium/internal/httputil" "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/telemetry/metrics" - "github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/storage" + "github.com/pomerium/pomerium/pkg/telemetry/trace" "github.com/pomerium/pomerium/proxy/portal" )