2023-07-17 08:08:20 +00:00
go_bin := " $$ (go env GOPATH)/bin "
gen_authopt_path := " $( go_bin) /protoc-gen-authoption "
gen_zitadel_path := " $( go_bin) /protoc-gen-zitadel "
2024-10-28 12:36:57 +00:00
now := $( shell date '+%Y-%m-%dT%T%z' | sed -E 's/.([0-9]{2})([0-9]{2})$$/-\1:\2/' )
2023-09-14 13:30:59 +00:00
VERSION ?= development-$( now)
2023-07-17 08:08:20 +00:00
COMMIT_SHA ?= $( shell git rev-parse HEAD)
2024-02-27 16:29:09 +00:00
ZITADEL_IMAGE ?= zitadel:local
2023-07-17 08:08:20 +00:00
2024-09-06 12:47:57 +00:00
GOCOVERDIR = tmp/coverage
INTEGRATION_DB_FLAVOR ?= postgres
ZITADEL_MASTERKEY ?= MasterkeyNeedsToHave32Characters
export GOCOVERDIR INTEGRATION_DB_FLAVOR ZITADEL_MASTERKEY
2023-07-17 08:08:20 +00:00
.PHONY : compile
compile : core_build console_build compile_pipeline
2024-02-27 16:29:09 +00:00
.PHONY : docker_image
docker_image : compile
DOCKER_BUILDKIT = 1 docker build -f build/Dockerfile -t $( ZITADEL_IMAGE) .
2023-07-17 08:08:20 +00:00
.PHONY : compile_pipeline
compile_pipeline : console_move
CGO_ENABLED = 0 go build -o zitadel -v -ldflags= " -s -w -X 'github.com/zitadel/zitadel/cmd/build.commit= $( COMMIT_SHA) ' -X 'github.com/zitadel/zitadel/cmd/build.date= $( now) ' -X 'github.com/zitadel/zitadel/cmd/build.version= $( VERSION) ' "
chmod +x zitadel
.PHONY : core_dependencies
core_dependencies :
go mod download
.PHONY : core_static
core_static :
go install github.com/rakyll/statik@v0.1.7
go generate internal/api/ui/login/static/resources/generate.go
2023-07-25 05:52:59 +00:00
go generate internal/api/ui/login/statik/generate.go
2023-07-17 08:08:20 +00:00
go generate internal/notification/statik/generate.go
go generate internal/statik/generate.go
2023-11-22 10:56:43 +00:00
.PHONY : core_generate_all
core_generate_all :
2024-07-04 06:28:56 +00:00
go install github.com/dmarkham/enumer@v1.5.10 # https://pkg.go.dev/github.com/dmarkham/enumer?tab=versions
2024-01-16 09:27:09 +00:00
go install github.com/rakyll/statik@v0.1.7 # https://pkg.go.dev/github.com/rakyll/statik?tab=versions
go install go.uber.org/mock/mockgen@v0.4.0 # https://pkg.go.dev/go.uber.org/mock/mockgen?tab=versions
2024-07-04 06:28:56 +00:00
go install golang.org/x/tools/cmd/stringer@v0.22.0 # https://pkg.go.dev/golang.org/x/tools/cmd/stringer?tab=versions
2023-11-22 10:56:43 +00:00
go generate ./...
2023-07-17 08:08:20 +00:00
.PHONY : core_assets
core_assets :
mkdir -p docs/apis/assets
go run internal/api/assets/generator/asset_generator.go -directory= internal/api/assets/generator/ -assets= docs/apis/assets/assets.md
.PHONY : core_api_generator
core_api_generator :
i f e q ( , $( wildcard $ ( gen_authopt_path ) ) )
go install internal/protoc/protoc-gen-authoption/main.go \
&& mv $$ ( go env GOPATH) /bin/main $( gen_authopt_path)
e n d i f
i f e q ( , $( wildcard $ ( gen_zitadel_path ) ) )
go install internal/protoc/protoc-gen-zitadel/main.go \
&& mv $$ ( go env GOPATH) /bin/main $( gen_zitadel_path)
e n d i f
.PHONY : core_grpc_dependencies
core_grpc_dependencies :
perf(query): remove transactions for queries (#8614)
# Which Problems Are Solved
Queries currently execute 3 statements, begin, query, commit
# How the Problems Are Solved
remove transaction handling from query methods in database package
# Additional Changes
- Bump versions of `core_grpc_dependencies`-receipt in Makefile
# Additional info
During load tests we saw a lot of idle transactions of `zitadel_queries`
application name which is the connection pool used to query data in
zitadel. Executed query:
`select query_start - xact_start, pid, application_name, backend_start,
xact_start, query_start, state_change, wait_event_type,
wait_event,substring(query, 1, 200) query from pg_stat_activity where
datname = 'zitadel' and state <> 'idle';`
Mostly the last query executed was `begin isolation level read committed
read only`.
example:
```
?column? | pid | application_name | backend_start | xact_start | query_start | state_change | wait_event_type | wait_event | query
-----------------+-------+----------------------------+-------------------------------+-------------------------------+-------------------------------+-------------------------------+-----------------+--------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
00:00:00 | 33030 | zitadel_queries | 2024-10-16 16:25:53.906036+00 | 2024-10-16 16:30:19.191661+00 | 2024-10-16 16:30:19.191661+00 | 2024-10-16 16:30:19.19169+00 | Client | ClientRead | begin isolation level read committed read only
00:00:00 | 33035 | zitadel_queries | 2024-10-16 16:25:53.909629+00 | 2024-10-16 16:30:19.19179+00 | 2024-10-16 16:30:19.19179+00 | 2024-10-16 16:30:19.191805+00 | Client | ClientRead | begin isolation level read committed read only
00:00:00.00412 | 33028 | zitadel_queries | 2024-10-16 16:25:53.904247+00 | 2024-10-16 16:30:19.187734+00 | 2024-10-16 16:30:19.191854+00 | 2024-10-16 16:30:19.191964+00 | Client | ClientRead | SELECT created_at, event_type, "sequence", "position", payload, creator, "owner", instance_id, aggregate_type, aggregate_id, revision FROM eventstore.events2 WHERE instance_id = $1 AND aggregate_type
00:00:00.084662 | 33134 | zitadel_es_pusher | 2024-10-16 16:29:54.979692+00 | 2024-10-16 16:30:19.178578+00 | 2024-10-16 16:30:19.26324+00 | 2024-10-16 16:30:19.263267+00 | Client | ClientRead | RELEASE SAVEPOINT cockroach_restart
00:00:00.084768 | 33139 | zitadel_es_pusher | 2024-10-16 16:29:54.979585+00 | 2024-10-16 16:30:19.180762+00 | 2024-10-16 16:30:19.26553+00 | 2024-10-16 16:30:19.265531+00 | LWLock | WALWriteLock | commit
00:00:00.077377 | 33136 | zitadel_es_pusher | 2024-10-16 16:29:54.978582+00 | 2024-10-16 16:30:19.187883+00 | 2024-10-16 16:30:19.26526+00 | 2024-10-16 16:30:19.265431+00 | Client | ClientRead | WITH existing AS ( +
| | | | | | | | | (SELECT instance_id, aggregate_type, aggregate_id, "sequence" FROM eventstore.events2 WHERE instance_id = $1 AND aggregate_type = $2 AND aggregate_id = $3 ORDER BY "sequence" DE
00:00:00.012309 | 33123 | zitadel_es_pusher | 2024-10-16 16:29:54.963484+00 | 2024-10-16 16:30:19.175066+00 | 2024-10-16 16:30:19.187375+00 | 2024-10-16 16:30:19.187376+00 | IO | WalSync | commit
00:00:00 | 33034 | zitadel_queries | 2024-10-16 16:25:53.90791+00 | 2024-10-16 16:30:19.262921+00 | 2024-10-16 16:30:19.262921+00 | 2024-10-16 16:30:19.263133+00 | Client | ClientRead | begin isolation level read committed read only
00:00:00 | 33039 | zitadel_queries | 2024-10-16 16:25:53.914106+00 | 2024-10-16 16:30:19.191676+00 | 2024-10-16 16:30:19.191676+00 | 2024-10-16 16:30:19.191687+00 | Client | ClientRead | begin isolation level read committed read only
00:00:00.24539 | 33083 | zitadel_projection_spooler | 2024-10-16 16:27:49.895548+00 | 2024-10-16 16:30:19.020058+00 | 2024-10-16 16:30:19.265448+00 | 2024-10-16 16:30:19.26546+00 | Client | ClientRead | SAVEPOINT exec_stmt
00:00:00 | 33125 | zitadel_es_pusher | 2024-10-16 16:29:54.963859+00 | 2024-10-16 16:30:19.191715+00 | 2024-10-16 16:30:19.191715+00 | 2024-10-16 16:30:19.191729+00 | Client | ClientRead | begin
00:00:00.004292 | 33032 | zitadel_queries | 2024-10-16 16:25:53.906624+00 | 2024-10-16 16:30:19.187713+00 | 2024-10-16 16:30:19.192005+00 | 2024-10-16 16:30:19.192062+00 | Client | ClientRead | SELECT created_at, event_type, "sequence", "position", payload, creator, "owner", instance_id, aggregate_type, aggregate_id, revision FROM eventstore.events2 WHERE instance_id = $1 AND aggregate_type
00:00:00 | 33031 | zitadel_queries | 2024-10-16 16:25:53.906422+00 | 2024-10-16 16:30:19.191625+00 | 2024-10-16 16:30:19.191625+00 | 2024-10-16 16:30:19.191645+00 | Client | ClientRead | begin isolation level read committed read only
```
The amount of idle transactions is significantly less if the query
transactions are removed:
example:
```
?column? | pid | application_name | backend_start | xact_start | query_start | state_change | wait_event_type | wait_event | query
-----------------+-------+----------------------------+-------------------------------+-------------------------------+-------------------------------+-------------------------------+-----------------+------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
00:00:00.000094 | 32741 | zitadel_queries | 2024-10-16 16:23:49.73935+00 | 2024-10-16 16:24:59.785589+00 | 2024-10-16 16:24:59.785683+00 | 2024-10-16 16:24:59.785684+00 | | | SELECT created_at, event_type, "sequence", "position", payload, creator, "owner", instance_id, aggregate_type, aggregate_id, revision FROM eventstore.events2 WHERE instance_id = $1 AND aggregate_type
00:00:00 | 32762 | zitadel_es_pusher | 2024-10-16 16:24:02.275136+00 | 2024-10-16 16:24:59.784586+00 | 2024-10-16 16:24:59.784586+00 | 2024-10-16 16:24:59.784607+00 | Client | ClientRead | begin
00:00:00.000167 | 32742 | zitadel_queries | 2024-10-16 16:23:49.740489+00 | 2024-10-16 16:24:59.784274+00 | 2024-10-16 16:24:59.784441+00 | 2024-10-16 16:24:59.784442+00 | | | with usr as ( +
| | | | | | | | | select u.id, u.creation_date, u.change_date, u.sequence, u.state, u.resource_owner, u.username, n.login_name as preferred_login_name +
| | | | | | | | | from projections.users13 u +
| | | | | | | | | left join projections.l
00:00:00.256014 | 32759 | zitadel_projection_spooler | 2024-10-16 16:24:01.418429+00 | 2024-10-16 16:24:59.52959+00 | 2024-10-16 16:24:59.785604+00 | 2024-10-16 16:24:59.785649+00 | Client | ClientRead | UPDATE projections.milestones SET reached_date = $1 WHERE (instance_id = $2) AND (type = $3) AND (reached_date IS NULL)
00:00:00.014199 | 32773 | zitadel_es_pusher | 2024-10-16 16:24:02.320404+00 | 2024-10-16 16:24:59.769509+00 | 2024-10-16 16:24:59.783708+00 | 2024-10-16 16:24:59.783709+00 | IO | WalSync | commit
00:00:00 | 32765 | zitadel_es_pusher | 2024-10-16 16:24:02.28173+00 | 2024-10-16 16:24:59.780413+00 | 2024-10-16 16:24:59.780413+00 | 2024-10-16 16:24:59.780426+00 | Client | ClientRead | begin
00:00:00.012729 | 32777 | zitadel_es_pusher | 2024-10-16 16:24:02.339737+00 | 2024-10-16 16:24:59.767432+00 | 2024-10-16 16:24:59.780161+00 | 2024-10-16 16:24:59.780195+00 | Client | ClientRead | RELEASE SAVEPOINT cockroach_restart
```
---------
Co-authored-by: Tim Möhlmann <tim+github@zitadel.com>
Co-authored-by: Livio Spring <livio.a@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Elio Bischof <elio@zitadel.com>
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
Co-authored-by: Miguel Cabrerizo <30386061+doncicuto@users.noreply.github.com>
Co-authored-by: Joakim Lodén <Loddan@users.noreply.github.com>
Co-authored-by: Yxnt <Yxnt@users.noreply.github.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Harsha Reddy <harsha.reddy@klaviyo.com>
Co-authored-by: Zach H <zhirschtritt@gmail.com>
2024-11-04 09:06:14 +00:00
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.35.1 # https://pkg.go.dev/google.golang.org/protobuf/cmd/protoc-gen-go?tab=versions
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1 # https://pkg.go.dev/google.golang.org/grpc/cmd/protoc-gen-go-grpc?tab=versions
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.22.0 # https://pkg.go.dev/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway?tab=versions
go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@v2.22.0 # https://pkg.go.dev/github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2?tab=versions
go install github.com/envoyproxy/protoc-gen-validate@v1.1.0 # https://pkg.go.dev/github.com/envoyproxy/protoc-gen-validate?tab=versions
go install github.com/bufbuild/buf/cmd/buf@v1.45.0 # https://pkg.go.dev/github.com/bufbuild/buf/cmd/buf?tab=versions
2023-07-17 08:08:20 +00:00
.PHONY : core_api
core_api : core_api_generator core_grpc_dependencies
buf generate
mkdir -p pkg/grpc
cp -r .artifacts/grpc/github.com/zitadel/zitadel/pkg/grpc/* pkg/grpc/
mkdir -p openapi/v2/zitadel
cp -r .artifacts/grpc/zitadel/ openapi/v2/zitadel
.PHONY : core_build
core_build : core_dependencies core_api core_static core_assets
.PHONY : console_move
console_move :
cp -r console/dist/console/* internal/api/ui/console/static
.PHONY : console_dependencies
console_dependencies :
cd console && \
yarn install --immutable
.PHONY : console_client
console_client :
cd console && \
yarn generate
.PHONY : console_build
console_build : console_dependencies console_client
cd console && \
yarn build
.PHONY : clean
clean :
2023-10-18 09:46:45 +00:00
$( RM) -r .artifacts/grpc
2023-07-17 08:08:20 +00:00
$( RM) $( gen_authopt_path)
$( RM) $( gen_zitadel_path)
2024-09-06 12:47:57 +00:00
$( RM) -r tmp/
2023-07-17 08:08:20 +00:00
.PHONY : core_unit_test
core_unit_test :
2024-09-06 12:47:57 +00:00
go test -race -coverprofile= profile.cov -coverpkg= ./internal/... ./...
.PHONY : core_integration_db_up
core_integration_db_up :
docker compose -f internal/integration/config/docker-compose.yaml up --pull always --wait $$ { INTEGRATION_DB_FLAVOR}
.PHONY : core_integration_db_down
core_integration_db_down :
docker compose -f internal/integration/config/docker-compose.yaml down
2023-07-17 08:08:20 +00:00
2023-08-11 15:36:18 +00:00
.PHONY : core_integration_setup
core_integration_setup :
2024-09-06 12:47:57 +00:00
go build -cover -race -tags integration -o zitadel.test main.go
mkdir -p $$ { GOCOVERDIR}
GORACE = "halt_on_error=1" ./zitadel.test init --config internal/integration/config/zitadel.yaml --config internal/integration/config/${ INTEGRATION_DB_FLAVOR } .yaml
GORACE = "halt_on_error=1" ./zitadel.test setup --masterkeyFromEnv --init-projections --config internal/integration/config/zitadel.yaml --config internal/integration/config/${ INTEGRATION_DB_FLAVOR } .yaml --steps internal/integration/config/steps.yaml
.PHONY : core_integration_server_start
core_integration_server_start : core_integration_setup
GORACE = "log_path=tmp/race.log" \
./zitadel.test start --masterkeyFromEnv --config internal/integration/config/zitadel.yaml --config internal/integration/config/${ INTEGRATION_DB_FLAVOR } .yaml \
> tmp/zitadel.log 2>& 1 \
& printf $$ ! > tmp/zitadel.pid
.PHONY : core_integration_test_packages
core_integration_test_packages :
2024-09-25 19:40:21 +00:00
go test -race -count 1 -tags integration -timeout 30m $$ ( go list -tags integration ./... | grep "integration_test" )
2024-09-06 12:47:57 +00:00
.PHONY : core_integration_server_stop
core_integration_server_stop :
pid = $$ ( cat tmp/zitadel.pid) ; \
$( RM) tmp/zitadel.pid; \
kill $$ pid; \
if [ -s tmp/race.log.$$ pid ] ; then \
cat tmp/race.log.$$ pid; \
exit 66; \
fi
.PHONY : core_integration_reports
core_integration_reports :
go tool covdata textfmt -i= tmp/coverage -pkg= github.com/zitadel/zitadel/internal/...,github.com/zitadel/zitadel/cmd/... -o profile.cov
2023-08-11 15:36:18 +00:00
.PHONY : core_integration_test
2024-09-06 12:47:57 +00:00
core_integration_test : core_integration_server_start core_integration_test_packages core_integration_server_stop core_integration_reports
2024-04-05 09:35:49 +00:00
2023-07-17 08:08:20 +00:00
.PHONY : console_lint
console_lint :
cd console && \
yarn lint
2024-02-27 16:29:09 +00:00
.PHONY : core_lint
2023-07-17 08:08:20 +00:00
core_lint :
golangci-lint run \
--timeout 10m \
--config ./.golangci.yaml \
--out-format= github-actions \
2023-07-25 05:52:59 +00:00
--concurrency= $$ ( getconf _NPROCESSORS_ONLN)