Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions buf.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ managed:
enabled: true
disable:
- module: buf.build/googleapis/googleapis
- module: buf.build/grpc-ecosystem/grpc-gateway
- module: buf.build/envoyproxy/protoc-gen-validate
override:
- file_option: "go_package"
Expand All @@ -13,21 +12,9 @@ plugins:
- remote: "buf.build/protocolbuffers/go:v1.30.0"
out: "proto"
opt: "paths=source_relative"
- remote: "buf.build/grpc/go:v1.3.0"
out: "proto"
opt: "paths=source_relative"
- remote: "buf.build/bufbuild/validate-go:v1.0.0"
out: "proto"
opt: "paths=source_relative"
- remote: "buf.build/grpc-ecosystem/gateway:v2.15.2"
out: "proto"
opt: "paths=source_relative"
- remote: "buf.build/grpc-ecosystem/openapiv2:v2.16.0"
out: "proto"
opt:
- allow_merge=true
- output_format=yaml
- json_names_for_fields=false
- remote: buf.build/connectrpc/go:v1.18.1
out: "proto"
opt: "paths=source_relative"
41 changes: 2 additions & 39 deletions cmd/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cmd
import (
"context"
"encoding/base64"
"errors"
"fmt"
"net/http"
"os"
Expand Down Expand Up @@ -84,7 +83,6 @@ import (

_ "github.com/authzed/authzed-go/proto/authzed/api/v0"
_ "github.com/jackc/pgx/v4/stdlib"
newrelic "github.com/newrelic/go-agent"
"github.com/raystack/frontier/core/authenticate"
"github.com/raystack/frontier/core/authenticate/session"
"github.com/raystack/frontier/core/metaschema"
Expand All @@ -108,7 +106,6 @@ import (

"github.com/pkg/profile"
"github.com/raystack/salt/log"
"google.golang.org/grpc/codes"
)

var ruleCacheRefreshDelay = time.Minute * 2
Expand Down Expand Up @@ -159,11 +156,6 @@ func StartServer(logger *log.Zap, cfg *config.Frontier) error {
}
billingPlanRepository := blob.NewPlanRepository(billingBlobFS)

// setup telemetry
nrApp, err := setupNewRelic(cfg.NewRelic, logger)
if err != nil {
return err
}
promRegistry := prometheus.NewRegistry()
promMetrics := prometheusmiddleware.NewClientMetrics(
prometheusmiddleware.WithClientHandlingTimeHistogram(),
Expand Down Expand Up @@ -307,15 +299,8 @@ func StartServer(logger *log.Zap, cfg *config.Frontier) error {

go server.ServeUI(ctx, logger, cfg.UI, cfg.App)

// start connect server
go func() {
if err := server.ServeConnect(ctx, logger, cfg.App, deps, promRegistry); err != nil {
logger.Fatal("connect server failed", "err", err.Error())
}
}()

// serving grpc server
return server.Serve(ctx, logger, cfg.App, nrApp, deps, promRegistry)
// start connect server (blocking)
return server.ServeConnect(ctx, logger, cfg.App, deps, promRegistry)
}

func buildAPIDependencies(
Expand Down Expand Up @@ -676,28 +661,6 @@ func getStripeClient(logger log.Logger, cfg *config.Frontier) *client.API {
return stripeClient
}

func setupNewRelic(cfg config.NewRelic, logger log.Logger) (newrelic.Application, error) {
nrCfg := newrelic.NewConfig(cfg.AppName, cfg.License)
nrCfg.Enabled = cfg.Enabled
nrCfg.ErrorCollector.IgnoreStatusCodes = []int{
http.StatusNotFound,
http.StatusUnauthorized,
int(codes.Unauthenticated),
int(codes.PermissionDenied),
int(codes.InvalidArgument),
int(codes.AlreadyExists),
}

if nrCfg.Enabled {
nrApp, err := newrelic.NewApplication(nrCfg)
if err != nil {
return nil, errors.New("failed to load Newrelic Application")
}
return nrApp, nil
}
return nil, nil
}

func setupDB(cfg db.Config, logger log.Logger) (dbc *db.Client, err error) {
// prefer use pgx instead of lib/pq for postgres to catch pg error
if cfg.Driver == "postgres" {
Expand Down
3 changes: 0 additions & 3 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,5 @@ func Load(serverConfigFileFromFlag string) (*Frontier, error) {
}

func postHook(conf *Frontier) *Frontier {
if len(conf.App.CorsOrigin) != 0 {
conf.App.Cors.AllowedOrigins = conf.App.CorsOrigin
}
return conf
}
Loading
Loading