release-1.1.0-rc.1 (#1286 )

Improved tests for statestore - redis (#1264 )
Added unary interceptor and removed extra logs (#1255 )
2025-04-04 12:09:58 +00:00 · 2020-11-18 13:42:34 -08:00 · 2020-10-12 19:21:51 -07:00 · 2020-09-21 15:02:29 -07:00 · 2020-09-21 12:22:03 -07:00 · 2020-09-15 11:18:17 -07:00
216 changed files with 7638 additions and 4975 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -0,0 +1,16 @@
+<!--  Thanks for sending a pull request!  Here are some tips for you:
+If this is your first time, please read our contributor guidelines: https://github.com/googleforgames/open-match/blob/master/CONTRIBUTING.md and developer guide https://github.com/googleforgames/open-match/blob/master/docs/development.md
+-->
+
+**What this PR does / Why we need it**:
+
+**Which issue(s) this PR fixes**:
+<!--
+*Automatically closes linked issue when PR is merged.
+Usage: `Closes #<issue number>`, or `Closes (paste link of issue)`.
+-->
+Closes #
+
+**Special notes for your reviewer**:
+
+
--- a/172
+++ b/172
@ -52,7 +52,7 @@
 # If you want information on how to edit this file checkout,
 # http://makefiletutorial.com/

-BASE_VERSION = 0.0.0-dev
+BASE_VERSION = 1.1.0-rc.1
 SHORT_SHA = $(shell git rev-parse --short=7 HEAD | tr -d [:punct:])
 BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD | tr -d [:punct:])
 VERSION = $(BASE_VERSION)-$(SHORT_SHA)
@ -67,6 +67,8 @@ MINIKUBE_VERSION = latest
 GOLANGCI_VERSION = 1.18.0
 KIND_VERSION = 0.5.1
 SWAGGERUI_VERSION = 3.24.2
+GOOGLE_APIS_VERSION = aba342359b6743353195ca53f944fe71e6fb6cd4
+GRPC_GATEWAY_VERSION = 1.14.3
 TERRAFORM_VERSION = 0.12.13
 CHART_TESTING_VERSION = 2.4.0

@ -77,7 +79,6 @@ ENABLE_SECURITY_HARDENING = 0
 GO = GO111MODULE=on go
 # Defines the absolute local directory of the open-match project
 REPOSITORY_ROOT := $(patsubst %/,%,$(dir $(abspath $(MAKEFILE_LIST))))
-GO_BUILD_COMMAND = CGO_ENABLED=0 $(GO) build -a -installsuffix cgo .
 BUILD_DIR = $(REPOSITORY_ROOT)/build
 TOOLCHAIN_DIR = $(BUILD_DIR)/toolchain
 TOOLCHAIN_BIN = $(TOOLCHAIN_DIR)/bin
@ -122,7 +123,7 @@ GCLOUD = gcloud --quiet
 OPEN_MATCH_HELM_NAME = open-match
 OPEN_MATCH_KUBERNETES_NAMESPACE = open-match
 OPEN_MATCH_SECRETS_DIR = $(REPOSITORY_ROOT)/install/helm/open-match/secrets
-GCLOUD_ACCOUNT_EMAIL = $(shell gcloud auth list --format yaml | grep account: | cut -c 10-)
+GCLOUD_ACCOUNT_EMAIL = $(shell gcloud auth list --format yaml | grep ACTIVE -a2 | grep account: | cut -c 10-)
 _GCB_POST_SUBMIT ?= 0
 # Latest version triggers builds of :latest images.
 _GCB_LATEST_VERSION ?= undefined
@ -196,7 +197,7 @@ ALL_PROTOS = $(GOLANG_PROTOS) $(SWAGGER_JSON_DOCS)
 CMDS = $(notdir $(wildcard cmd/*))

 # Names of the individual images, ommiting the openmatch prefix.
-IMAGES = $(CMDS) mmf-go-soloduel mmf-go-pool base-build
+IMAGES = $(CMDS) mmf-go-soloduel base-build

 help:
 	@cat Makefile | grep ^\#\# | grep -v ^\#\#\# |cut -c 4-
@ -214,6 +215,9 @@ local-cloud-build: gcloud
 ## "openmatch-" prefix on the image name and tags.
 ##

+list-images:
+	@echo $(IMAGES)
+
 #######################################
 ## build-images / build-<image name>-image: builds images locally
 ##
@ -236,9 +240,6 @@ $(foreach CMD,$(CMDS),build-$(CMD)-image): build-%-image: docker build-base-buil
 build-mmf-go-soloduel-image: docker build-base-build-image
 	docker build -f examples/functions/golang/soloduel/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(ALTERNATE_TAG) .

-build-mmf-go-pool-image: docker build-base-build-image
-	docker build -f test/matchfunction/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-pool:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-pool:$(ALTERNATE_TAG) .
-
 #######################################
 ## push-images / push-<image name>-image: builds and pushes images to your
 ## container registry.
@ -361,12 +362,16 @@ install-scale-chart: install-chart-prerequisite build/toolchain/bin/helm$(EXE_EX
 # install-ci-chart will install open-match-core with pool based mmf for end-to-end in-cluster test.
 install-ci-chart: install-chart-prerequisite build/toolchain/bin/helm$(EXE_EXTENSION) install/helm/open-match/secrets/
 	$(HELM) upgrade $(OPEN_MATCH_HELM_NAME) $(HELM_UPGRADE_FLAGS) --atomic install/helm/open-match $(HELM_IMAGE_FLAGS) \
-		--set open-match-core.ignoreListTTL=500ms \
-		--set open-match-customize.enabled=true \
-		--set open-match-customize.function.enabled=true \
-		--set open-match-customize.evaluator.enabled=true \
-		--set open-match-customize.function.image=openmatch-mmf-go-pool \
-		--set query.replicas=1,frontend.replicas=1,backend.replicas=1,open-match-customize.evaluator.replicas=1,open-match-customize.function.replicas=1 \
+		--set query.replicas=1,frontend.replicas=1,backend.replicas=1 \
+		--set evaluator.hostName=open-match-test \
+		--set evaluator.grpcPort=50509 \
+		--set evaluator.httpPort=51509 \
+		--set open-match-core.registrationInterval=200ms \
+		--set open-match-core.proposalCollectionInterval=200ms \
+		--set open-match-core.assignedDeleteTimeout=200ms \
+		--set open-match-core.pendingReleaseTimeout=200ms \
+		--set open-match-core.queryPageSize=10 \
+		--set global.gcpProjectId=intentionally-invalid-value \
 		--set redis.master.resources.requests.cpu=0.6,redis.master.resources.requests.memory=300Mi \
 		--set ci=true

@ -378,11 +383,18 @@ delete-chart: build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/kubec
 	-$(KUBECTL) delete namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE)
 	-$(KUBECTL) delete namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE)-demo

+ifneq ($(BASE_VERSION), 0.0.0-dev)
+install/yaml/: REGISTRY = gcr.io/$(OPEN_MATCH_PUBLIC_IMAGES_PROJECT_ID)
+install/yaml/: TAG = $(BASE_VERSION)
+endif
 install/yaml/: update-chart-deps install/yaml/install.yaml install/yaml/01-open-match-core.yaml install/yaml/02-open-match-demo.yaml install/yaml/03-prometheus-chart.yaml install/yaml/04-grafana-chart.yaml install/yaml/05-jaeger-chart.yaml install/yaml/06-open-match-override-configmap.yaml install/yaml/07-open-match-default-evaluator.yaml

+# We have to hard-code the Jaeger endpoints as we are excluding Jaeger, so Helm cannot determine the endpoints from the Jaeger subchart
 install/yaml/01-open-match-core.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
 	$(HELM) template $(OPEN_MATCH_HELM_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
+		--set-string global.telemetry.jaeger.agentEndpoint="$(OPEN_MATCH_HELM_NAME)-jaeger-agent:6831" \
+		--set-string global.telemetry.jaeger.collectorEndpoint="http://$(OPEN_MATCH_HELM_NAME)-jaeger-collector:14268/api/traces" \
 		install/helm/open-match > install/yaml/01-open-match-core.yaml

 install/yaml/02-open-match-demo.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
@ -400,6 +412,7 @@ install/yaml/03-prometheus-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 		--set global.telemetry.prometheus.enabled=true \
 		install/helm/open-match > install/yaml/03-prometheus-chart.yaml

+# We have to hard-code the Prometheus Server URL as we are excluding Prometheus, so Helm cannot determine the URL from the Prometheus subchart
 install/yaml/04-grafana-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
 	$(HELM) template $(OPEN_MATCH_HELM_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
@ -407,6 +420,7 @@ install/yaml/04-grafana-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 		--set open-match-core.redis.enabled=false \
 		--set open-match-telemetry.enabled=true \
 		--set global.telemetry.grafana.enabled=true \
+		--set-string global.telemetry.grafana.prometheusServer="http://$(OPEN_MATCH_HELM_NAME)-prometheus-server.$(OPEN_MATCH_KUBERNETES_NAMESPACE).svc.cluster.local:80/" \
 		install/helm/open-match > install/yaml/04-grafana-chart.yaml

 install/yaml/05-jaeger-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
@ -453,7 +467,7 @@ set-redis-password:
 		read REDIS_PASSWORD; \
 		stty echo; \
 		printf "\n"; \
-		$(KUBECTL) create secret generic om-redis -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) --from-literal=redis-password=$$REDIS_PASSWORD --dry-run -o yaml | $(KUBECTL) replace -f - --force
+		$(KUBECTL) create secret generic open-match-redis -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) --from-literal=redis-password=$$REDIS_PASSWORD --dry-run -o yaml | $(KUBECTL) replace -f - --force

 install-toolchain: install-kubernetes-tools install-protoc-tools install-openmatch-tools
 install-kubernetes-tools: build/toolchain/bin/kubectl$(EXE_EXTENSION) build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/minikube$(EXE_EXTENSION) build/toolchain/bin/terraform$(EXE_EXTENSION)
@ -535,13 +549,13 @@ build/toolchain/bin/protoc-gen-swagger$(EXE_EXTENSION):
 	mkdir -p $(TOOLCHAIN_BIN)
 	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger

-build/toolchain/bin/certgen$(EXE_EXTENSION): tools/certgen/certgen$(EXE_EXTENSION)
+build/toolchain/bin/certgen$(EXE_EXTENSION):
 	mkdir -p $(TOOLCHAIN_BIN)
-	cp -f $(REPOSITORY_ROOT)/tools/certgen/certgen$(EXE_EXTENSION) $(CERTGEN)
+	cd $(TOOLCHAIN_BIN) && $(GO) build $(REPOSITORY_ROOT)/tools/certgen/

-build/toolchain/bin/reaper$(EXE_EXTENSION): tools/reaper/reaper$(EXE_EXTENSION)
+build/toolchain/bin/reaper$(EXE_EXTENSION):
 	mkdir -p $(TOOLCHAIN_BIN)
-	cp -f $(REPOSITORY_ROOT)/tools/reaper/reaper$(EXE_EXTENSION) $(TOOLCHAIN_BIN)/reaper$(EXE_EXTENSION)
+	cd $(TOOLCHAIN_BIN) && $(GO) build $(REPOSITORY_ROOT)/tools/reaper/

 # Fake target for docker
 docker: no-sudo
@ -591,7 +605,10 @@ get-kind-kubeconfig: build/toolchain/bin/kind$(EXE_EXTENSION)
 delete-kind-cluster: build/toolchain/bin/kind$(EXE_EXTENSION) build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	-$(KIND) delete cluster

-create-gke-cluster: GKE_VERSION = 1.14.8-gke.17 # gcloud beta container get-server-config --zone us-west1-a
+create-cluster-role-binding:
+	$(KUBECTL) create clusterrolebinding myname-cluster-admin-binding --clusterrole=cluster-admin --user=$(GCLOUD_ACCOUNT_EMAIL)
+
+create-gke-cluster: GKE_VERSION = 1.14.10-gke.45 # gcloud beta container get-server-config --zone us-west1-a
 create-gke-cluster: GKE_CLUSTER_SHAPE_FLAGS = --machine-type n1-standard-4 --enable-autoscaling --min-nodes 1 --num-nodes 2 --max-nodes 10 --disk-size 50
 create-gke-cluster: GKE_FUTURE_COMPAT_FLAGS = --no-enable-basic-auth --no-issue-client-certificate --enable-ip-alias --metadata disable-legacy-endpoints=true --enable-autoupgrade
 create-gke-cluster: build/toolchain/bin/kubectl$(EXE_EXTENSION) gcloud
@ -600,7 +617,8 @@ create-gke-cluster: build/toolchain/bin/kubectl$(EXE_EXTENSION) gcloud
 		--cluster-version $(GKE_VERSION) \
 		--image-type cos_containerd \
 		--tags open-match
-	$(KUBECTL) create clusterrolebinding myname-cluster-admin-binding --clusterrole=cluster-admin --user=$(GCLOUD_ACCOUNT_EMAIL)
+	$(MAKE) create-cluster-role-binding
+	

 delete-gke-cluster: gcloud
 	-$(GCLOUD) $(GCP_PROJECT_FLAG) container clusters delete $(GKE_CLUSTER_NAME) $(GCP_LOCATION_FLAG) $(GCLOUD_EXTRA_FLAGS)
@ -650,16 +668,11 @@ api/api.md: third_party/ build/toolchain/bin/protoc-gen-doc$(EXE_EXTENSION)
 	$(PROTOC) api/*.proto \
 		-I $(REPOSITORY_ROOT) -I $(PROTOC_INCLUDES) \
  		--doc_out=. \
-  		--doc_opt=markdown,api.md
+  		--doc_opt=markdown,api_temp.md
 # Crazy hack that insert hugo link reference to this API doc -)
-	$(SED_REPLACE) '1 i\---\
-title: "Open Match API References" \
-linkTitle: "Open Match API References" \
-weight: 2 \
-description: \
-  This document provides API references for Open Match services. \
--- \
-' ./api.md && mv ./api.md $(REPOSITORY_ROOT)/../open-match-docs/site/content/en/docs/Reference/
+	cat ./docs/hugo_apiheader.txt ./api_temp.md >> api.md
+	mv ./api.md $(REPOSITORY_ROOT)/../open-match-docs/site/content/en/docs/Reference/
+	rm ./api_temp.md

 # Include structure of the protos needs to be called out do the dependency chain is run through properly.
 pkg/pb/backend.pb.go: pkg/pb/messages.pb.go
@ -673,9 +686,28 @@ build: assets
 	$(GO) build ./...
 	$(GO) build -tags e2ecluster ./...

+define test_folder
+	$(if $(wildcard $(1)/go.mod), \
+		cd $(1) && \
+		$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -race ./... && \
+		$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -run IgnoreRace$$ ./... \
+    )
+	$(foreach dir, $(wildcard $(1)/*/.), $(call test_folder, $(dir)))
+endef
+
+define fast_test_folder
+	$(if $(wildcard $(1)/go.mod), \
+		cd $(1) && \
+		$(GO) test ./... \
+    )
+	$(foreach dir, $(wildcard $(1)/*/.), $(call fast_test_folder, $(dir)))
+endef
+
 test: $(ALL_PROTOS) tls-certs third_party/
-	$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -race ./...
-	$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -run IgnoreRace$$ ./...
+	$(call test_folder,.)
+
+fasttest: $(ALL_PROTOS) tls-certs third_party/
+	$(call fast_test_folder,.)

 test-e2e-cluster: all-protos tls-certs third_party/
 	$(HELM) test --timeout 7m30s -v 0 --logs -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) $(OPEN_MATCH_HELM_NAME)
@ -720,57 +752,6 @@ build/cmd/demo-%/COPY_PHONY:
 	mkdir -p $(BUILD_DIR)/cmd/demo-$*/
 	cp -r examples/demo/static $(BUILD_DIR)/cmd/demo-$*/static

-all: service-binaries example-binaries tools-binaries
-
-service-binaries: cmd/minimatch/minimatch$(EXE_EXTENSION) cmd/swaggerui/swaggerui$(EXE_EXTENSION)
-service-binaries: cmd/backend/backend$(EXE_EXTENSION) cmd/frontend/frontend$(EXE_EXTENSION)
-service-binaries: cmd/query/query$(EXE_EXTENSION) cmd/synchronizer/synchronizer$(EXE_EXTENSION)
-
-example-binaries: example-mmf-binaries
-example-mmf-binaries: examples/functions/golang/soloduel/soloduel$(EXE_EXTENSION)
-
-examples/functions/golang/soloduel/soloduel$(EXE_EXTENSION): pkg/pb/query.pb.go pkg/pb/query.pb.gw.go api/query.swagger.json pkg/pb/matchfunction.pb.go pkg/pb/matchfunction.pb.gw.go api/matchfunction.swagger.json
-	cd $(REPOSITORY_ROOT)/examples/functions/golang/soloduel; $(GO_BUILD_COMMAND)
-
-test/matchfunction/matchfunction$(EXE_EXTENSION): pkg/pb/query.pb.go pkg/pb/query.pb.gw.go api/query.swagger.json pkg/pb/matchfunction.pb.go pkg/pb/matchfunction.pb.gw.go api/matchfunction.swagger.json
-	cd $(REPOSITORY_ROOT)/test/matchfunction; $(GO_BUILD_COMMAND)
-
-tools-binaries: tools/certgen/certgen$(EXE_EXTENSION) tools/reaper/reaper$(EXE_EXTENSION)
-
-cmd/backend/backend$(EXE_EXTENSION): pkg/pb/backend.pb.go pkg/pb/backend.pb.gw.go api/backend.swagger.json
-	cd $(REPOSITORY_ROOT)/cmd/backend; $(GO_BUILD_COMMAND)
-
-cmd/frontend/frontend$(EXE_EXTENSION): pkg/pb/frontend.pb.go pkg/pb/frontend.pb.gw.go api/frontend.swagger.json
-	cd $(REPOSITORY_ROOT)/cmd/frontend; $(GO_BUILD_COMMAND)
-
-cmd/query/query$(EXE_EXTENSION): pkg/pb/query.pb.go pkg/pb/query.pb.gw.go api/query.swagger.json
-	cd $(REPOSITORY_ROOT)/cmd/query; $(GO_BUILD_COMMAND)
-
-cmd/default-evaluator/default-evaluator$(EXE_EXTENSION): pkg/pb/evaluator.pb.go pkg/pb/evaluator.pb.gw.go api/evaluator.swagger.json
-	cd $(REPOSITORY_ROOT)/cmd/evaluator; $(GO_BUILD_COMMAND)
-
-cmd/synchronizer/synchronizer$(EXE_EXTENSION): internal/ipb/synchronizer.pb.go
-	cd $(REPOSITORY_ROOT)/cmd/synchronizer; $(GO_BUILD_COMMAND)
-
-# Note: This list of dependencies is long but only add file references here. If you add a .PHONY dependency make will always rebuild it.
-cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/backend.pb.go pkg/pb/backend.pb.gw.go api/backend.swagger.json
-cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/frontend.pb.go pkg/pb/frontend.pb.gw.go api/frontend.swagger.json
-cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/query.pb.go pkg/pb/query.pb.gw.go api/query.swagger.json
-cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/evaluator.pb.go pkg/pb/evaluator.pb.gw.go api/evaluator.swagger.json
-cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/matchfunction.pb.go pkg/pb/matchfunction.pb.gw.go api/matchfunction.swagger.json
-cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/messages.pb.go
-cmd/minimatch/minimatch$(EXE_EXTENSION): internal/ipb/synchronizer.pb.go
-	cd $(REPOSITORY_ROOT)/cmd/minimatch; $(GO_BUILD_COMMAND)
-
-cmd/swaggerui/swaggerui$(EXE_EXTENSION): third_party/swaggerui/
-	cd $(REPOSITORY_ROOT)/cmd/swaggerui; $(GO_BUILD_COMMAND)
-
-tools/certgen/certgen$(EXE_EXTENSION):
-	cd $(REPOSITORY_ROOT)/tools/certgen/ && $(GO_BUILD_COMMAND)
-
-tools/reaper/reaper$(EXE_EXTENSION):
-	cd $(REPOSITORY_ROOT)/tools/reaper/ && $(GO_BUILD_COMMAND)
-
 build/policies/binauthz.yaml: install/policies/binauthz.yaml
 	mkdir -p $(BUILD_DIR)/policies
 	cp -f $(REPOSITORY_ROOT)/install/policies/binauthz.yaml $(BUILD_DIR)/policies/binauthz.yaml
@ -827,7 +808,7 @@ ci-reap-namespaces: build/toolchain/bin/reaper$(EXE_EXTENSION)

 # For presubmit we want to update the protobuf generated files and verify that tests are good.
 presubmit: GOLANG_TEST_COUNT = 5
-presubmit: clean third_party/ update-chart-deps assets update-deps lint build install-toolchain test md-test terraform-test
+presubmit: clean third_party/ update-chart-deps assets update-deps lint build test md-test terraform-test

 build/release/: presubmit clean-install-yaml install/yaml/
 	mkdir -p $(BUILD_DIR)/release/
@ -861,19 +842,6 @@ clean-protos:
 	rm -rf $(REPOSITORY_ROOT)/pkg/pb/
 	rm -rf $(REPOSITORY_ROOT)/internal/ipb/

-clean-binaries:
-	rm -rf $(REPOSITORY_ROOT)/cmd/backend/backend$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/cmd/synchronizer/synchronizer$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/cmd/frontend/frontend$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/cmd/query/query$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/cmd/minimatch/minimatch$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/examples/functions/golang/soloduel/soloduel$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/test/matchfunction/matchfunction$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/test/evaluator/evaluator$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/cmd/swaggerui/swaggerui$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/tools/certgen/certgen$(EXE_EXTENSION)
-	rm -rf $(REPOSITORY_ROOT)/tools/reaper/reaper$(EXE_EXTENSION)
-
 clean-terraform:
 	rm -rf $(REPOSITORY_ROOT)/install/terraform/.terraform/

@ -898,7 +866,7 @@ clean-swagger-docs:
 clean-third-party:
 	rm -rf $(REPOSITORY_ROOT)/third_party/

-clean: clean-images clean-binaries clean-build clean-install-yaml clean-secrets clean-terraform clean-third-party clean-protos clean-swagger-docs
+clean: clean-images clean-build clean-install-yaml clean-secrets clean-terraform clean-third-party clean-protos clean-swagger-docs

 proxy-frontend: build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	@echo "Frontend Health: http://localhost:$(FRONTEND_PORT)/healthz"
@ -965,18 +933,18 @@ third_party/google/api:
 	mkdir -p $(TOOLCHAIN_DIR)/googleapis-temp/
 	mkdir -p $(REPOSITORY_ROOT)/third_party/google/api
 	mkdir -p $(REPOSITORY_ROOT)/third_party/google/rpc
-	curl -o $(TOOLCHAIN_DIR)/googleapis-temp/googleapis.zip -L https://github.com/googleapis/googleapis/archive/master.zip
+	curl -o $(TOOLCHAIN_DIR)/googleapis-temp/googleapis.zip -L https://github.com/googleapis/googleapis/archive/$(GOOGLE_APIS_VERSION).zip
 	(cd $(TOOLCHAIN_DIR)/googleapis-temp/; unzip -q -o googleapis.zip)
-	cp -f $(TOOLCHAIN_DIR)/googleapis-temp/googleapis-master/google/api/*.proto $(REPOSITORY_ROOT)/third_party/google/api/
-	cp -f $(TOOLCHAIN_DIR)/googleapis-temp/googleapis-master/google/rpc/*.proto $(REPOSITORY_ROOT)/third_party/google/rpc/
+	cp -f $(TOOLCHAIN_DIR)/googleapis-temp/googleapis-$(GOOGLE_APIS_VERSION)/google/api/*.proto $(REPOSITORY_ROOT)/third_party/google/api/
+	cp -f $(TOOLCHAIN_DIR)/googleapis-temp/googleapis-$(GOOGLE_APIS_VERSION)/google/rpc/*.proto $(REPOSITORY_ROOT)/third_party/google/rpc/
 	rm -rf $(TOOLCHAIN_DIR)/googleapis-temp

 third_party/protoc-gen-swagger/options:
 	mkdir -p $(TOOLCHAIN_DIR)/grpc-gateway-temp/
 	mkdir -p $(REPOSITORY_ROOT)/third_party/protoc-gen-swagger/options
-	curl -o $(TOOLCHAIN_DIR)/grpc-gateway-temp/grpc-gateway.zip -L https://github.com/grpc-ecosystem/grpc-gateway/archive/master.zip
+	curl -o $(TOOLCHAIN_DIR)/grpc-gateway-temp/grpc-gateway.zip -L https://github.com/grpc-ecosystem/grpc-gateway/archive/v$(GRPC_GATEWAY_VERSION).zip
 	(cd $(TOOLCHAIN_DIR)/grpc-gateway-temp/; unzip -q -o grpc-gateway.zip)
-	cp -f $(TOOLCHAIN_DIR)/grpc-gateway-temp/grpc-gateway-master/protoc-gen-swagger/options/*.proto $(REPOSITORY_ROOT)/third_party/protoc-gen-swagger/options/
+	cp -f $(TOOLCHAIN_DIR)/grpc-gateway-temp/grpc-gateway-$(GRPC_GATEWAY_VERSION)/protoc-gen-swagger/options/*.proto $(REPOSITORY_ROOT)/third_party/protoc-gen-swagger/options/
 	rm -rf $(TOOLCHAIN_DIR)/grpc-gateway-temp

 third_party/swaggerui/:
--- a/README.md
+++ b/README.md
@ -24,10 +24,6 @@ The [Open Match Development guide](docs/development.md) has detailed instruction
 on getting the source code, making changes, testing and submitting a pull request
 to Open Match.

-## Disclaimer
-
-This software is currently alpha, and subject to change.
-
 ## Support

 * [Slack Channel](https://open-match.slack.com/) ([Signup](https://join.slack.com/t/open-match/shared_invite/enQtNDM1NjcxNTY4MTgzLTM5ZWQxNjc1YWI3MzJmN2RiMWJmYWI0ZjFiNzNkZmNkMWQ3YWU5OGVkNzA5Yzc4OGVkOGU5MTc0OTA5ZTA5NDU))
--- a/api/backend.proto
+++ b/api/backend.proto
@ -88,6 +88,10 @@ message ReleaseTicketsRequest{

 message ReleaseTicketsResponse {}

+message ReleaseAllTicketsRequest{}
+
+message ReleaseAllTicketsResponse {}
+
 // AssignmentGroup contains an Assignment and the Tickets to which it should be applied. 
 message AssignmentGroup{
  // TicketIds is a list of strings representing Open Match generated Ids which apply to an Assignment.
@ -120,9 +124,11 @@ message AssignTicketsResponse {

 // The BackendService implements APIs to generate matches and handle ticket assignments.
 service BackendService {
-  // FetchMatches triggers a MatchFunction with the specified MatchProfile and returns a set of match proposals that 
-  // match the description of that MatchProfile.
-  // FetchMatches immediately returns an error if it encounters any execution failures.
+  // FetchMatches triggers a MatchFunction with the specified MatchProfile and
+  // returns a set of matches generated by the Match Making Function, and
+  // accepted by the evaluator.
+  // Tickets in matches returned by FetchMatches are moved from active to
+  // pending, and will not be returned by query.
  rpc FetchMatches(FetchMatchesRequest) returns (stream FetchMatchesResponse) {
    option (google.api.http) = {
      post: "/v1/backendservice/matches:fetch"
@ -138,9 +144,8 @@ service BackendService {
    };
  }

-  // ReleaseTickets removes the submitted tickets from the list that prevents tickets 
-  // that are awaiting assignment from appearing in MMF queries, effectively putting them back into
-  // the matchmaking pool
+  // ReleaseTickets moves tickets from the pending state, to the active state.
+  // This enables them to be returned by query, and find different matches.
  // 
  // BETA FEATURE WARNING:  This call and the associated Request and Response
  // messages are not finalized and still subject to possible change or removal.
@ -150,4 +155,17 @@ service BackendService {
      body: "*"
    };
  }
+
+  // ReleaseAllTickets moves all tickets from the pending state, to the active
+  // state. This enables them to be returned by query, and find different
+  // matches.
+  // 
+  // BETA FEATURE WARNING:  This call and the associated Request and Response
+  // messages are not finalized and still subject to possible change or removal.
+  rpc ReleaseAllTickets(ReleaseAllTicketsRequest) returns (ReleaseAllTicketsResponse) {
+    option (google.api.http) = {
+      post: "/v1/backendservice/tickets:releaseall"
+      body: "*"
+    };
+  }
 }
--- a/api/backend.swagger.json
+++ b/api/backend.swagger.json
@ -26,7 +26,7 @@
  "paths": {
    "/v1/backendservice/matches:fetch": {
      "post": {
-        "summary": "FetchMatches triggers a MatchFunction with the specified MatchProfile and returns a set of match proposals that \nmatch the description of that MatchProfile.\nFetchMatches immediately returns an error if it encounters any execution failures.",
+        "summary": "FetchMatches triggers a MatchFunction with the specified MatchProfile and\nreturns a set of matches generated by the Match Making Function, and\naccepted by the evaluator.\nTickets in matches returned by FetchMatches are moved from active to\npending, and will not be returned by query.",
        "operationId": "FetchMatches",
        "responses": {
          "200": {
@ -94,7 +94,7 @@
    },
    "/v1/backendservice/tickets:release": {
      "post": {
-        "summary": "ReleaseTickets removes the submitted tickets from the list that prevents tickets \nthat are awaiting assignment from appearing in MMF queries, effectively putting them back into\nthe matchmaking pool",
+        "summary": "ReleaseTickets moves tickets from the pending state, to the active state.\nThis enables them to be returned by query, and find different matches.",
        "description": "BETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
        "operationId": "ReleaseTickets",
        "responses": {
@ -126,6 +126,41 @@
          "BackendService"
        ]
      }
+    },
+    "/v1/backendservice/tickets:releaseall": {
+      "post": {
+        "summary": "ReleaseAllTickets moves all tickets from the pending state, to the active\nstate. This enables them to be returned by query, and find different\nmatches.",
+        "description": "BETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
+        "operationId": "ReleaseAllTickets",
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/openmatchReleaseAllTicketsResponse"
+            }
+          },
+          "404": {
+            "description": "Returned when the resource does not exist.",
+            "schema": {
+              "type": "string",
+              "format": "string"
+            }
+          }
+        },
+        "parameters": [
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/openmatchReleaseAllTicketsRequest"
+            }
+          }
+        ],
+        "tags": [
+          "BackendService"
+        ]
+      }
    }
  },
  "definitions": {
@ -176,7 +211,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
    },
    "openmatchAssignmentFailure": {
      "type": "object",
@ -368,6 +403,12 @@
      },
      "description": "Pool specfies a set of criteria that are used to select a subset of Tickets\nthat meet all the criteria."
    },
+    "openmatchReleaseAllTicketsRequest": {
+      "type": "object"
+    },
+    "openmatchReleaseAllTicketsResponse": {
+      "type": "object"
+    },
    "openmatchReleaseTicketsRequest": {
      "type": "object",
      "properties": {
@ -442,7 +483,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -458,10 +499,10 @@
        "create_time": {
          "type": "string",
          "format": "date-time",
-          "description": "Create time represents the time at which this Ticket was created. It is\npopulated by Open Match at the time of Ticket creation."
+          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
    },
    "protobufAny": {
      "type": "object",
--- a/api/evaluator.swagger.json
+++ b/api/evaluator.swagger.json
@ -76,7 +76,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
    },
    "openmatchEvaluateRequest": {
      "type": "object",
@ -165,7 +165,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -181,10 +181,10 @@
        "create_time": {
          "type": "string",
          "format": "date-time",
-          "description": "Create time represents the time at which this Ticket was created. It is\npopulated by Open Match at the time of Ticket creation."
+          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
    },
    "protobufAny": {
      "type": "object",
--- a/api/frontend.proto
+++ b/api/frontend.proto
@ -95,9 +95,7 @@ service FrontendService {
  }

  // DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.
-  // The client must delete the Ticket when finished matchmaking with it. 
-  //   - If SearchFields exist in a Ticket, DeleteTicket will deindex the fields lazily.
-  // Users may still be able to assign/get a ticket after calling DeleteTicket on it.
+  // The client should delete the Ticket when finished matchmaking with it. 
  rpc DeleteTicket(DeleteTicketRequest) returns (google.protobuf.Empty) {
    option (google.api.http) = {
      delete: "/v1/frontendservice/tickets/{ticket_id}"
--- a/api/frontend.swagger.json
+++ b/api/frontend.swagger.json
@ -91,7 +91,7 @@
        ]
      },
      "delete": {
-        "summary": "DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.\nThe client must delete the Ticket when finished matchmaking with it. \n  - If SearchFields exist in a Ticket, DeleteTicket will deindex the fields lazily.\nUsers may still be able to assign/get a ticket after calling DeleteTicket on it.",
+        "summary": "DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.\nThe client should delete the Ticket when finished matchmaking with it.",
        "operationId": "DeleteTicket",
        "responses": {
          "200": {
@ -172,7 +172,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
    },
    "openmatchCreateTicketRequest": {
      "type": "object",
@ -220,7 +220,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -236,10 +236,10 @@
        "create_time": {
          "type": "string",
          "format": "date-time",
-          "description": "Create time represents the time at which this Ticket was created. It is\npopulated by Open Match at the time of Ticket creation."
+          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
    },
    "openmatchWatchAssignmentsResponse": {
      "type": "object",
--- a/api/matchfunction.proto
+++ b/api/matchfunction.proto
@ -69,7 +69,7 @@ message RunResponse {
 // The MatchFunction service implements APIs to run user-defined matchmaking logics.
 service MatchFunction {
  // DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD.
-  // Run pulls Tickets that satisify Profile constraints from QueryService, runs matchmaking logics against them, then
+  // Run pulls Tickets that satisfy Profile constraints from QueryService, runs matchmaking logics against them, then
  // constructs and streams back match candidates to the Backend service.
  rpc Run(RunRequest) returns (stream RunResponse) {
    option (google.api.http) = {
--- a/api/matchfunction.swagger.json
+++ b/api/matchfunction.swagger.json
@ -26,7 +26,7 @@
  "paths": {
    "/v1/matchfunction:run": {
      "post": {
-        "summary": "DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD.\nRun pulls Tickets that satisify Profile constraints from QueryService, runs matchmaking logics against them, then\nconstructs and streams back match candidates to the Backend service.",
+        "summary": "DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD.\nRun pulls Tickets that satisfy Profile constraints from QueryService, runs matchmaking logics against them, then\nconstructs and streams back match candidates to the Backend service.",
        "operationId": "Run",
        "responses": {
          "200": {
@ -75,7 +75,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
    },
    "openmatchDoubleRangeFilter": {
      "type": "object",
@ -269,7 +269,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -285,10 +285,10 @@
        "create_time": {
          "type": "string",
          "format": "date-time",
-          "description": "Create time represents the time at which this Ticket was created. It is\npopulated by Open Match at the time of Ticket creation."
+          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
    },
    "protobufAny": {
      "type": "object",
--- a/api/messages.proto
+++ b/api/messages.proto
@ -21,16 +21,18 @@ import "google/rpc/status.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";

-// A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an
-// individual 'Player' or a 'Group' of players. Open Match will not interpret
-// what the Ticket represents but just treat it as a matchmaking unit with a set
-// of SearchFields. Open Match stores the Ticket in state storage and enables an
-// Assignment to be associated with this Ticket.
+// A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent
+// an individual 'Player', a 'Group' of players, or any other concepts unique to
+// your use case. Open Match will not interpret what the Ticket represents but
+// just treat it as a matchmaking unit with a set of SearchFields. Open Match
+// stores the Ticket in state storage and enables an Assignment to be set on the
+// Ticket.
 message Ticket {
  // Id represents an auto-generated Id issued by Open Match.
  string id = 1;

-  // An Assignment represents a game server assignment associated with a Ticket.
+  // An Assignment represents a game server assignment associated with a Ticket,
+  // or whatever finalized matched state means for your use case.
  // Open Match does not require or inspect any fields on Assignment.
  Assignment assignment = 3;

@ -43,8 +45,8 @@ message Ticket {
  // Optional, depending on the requirements of the connected systems.
  map<string, google.protobuf.Any> extensions = 5;

-  // Create time represents the time at which this Ticket was created. It is
-  // populated by Open Match at the time of Ticket creation.
+  // Create time is the time the Ticket was created. It is populated by Open
+  // Match at the time of Ticket creation.
  google.protobuf.Timestamp create_time = 6;

  // Deprecated fields.
@ -64,8 +66,8 @@ message SearchFields {
  repeated string tags = 3;
 }

-// An Assignment represents a game server assignment associated with a Ticket. Open
-// match does not require or inspect any fields on assignment.
+// An Assignment represents a game server assignment associated with a Ticket.
+// Open Match does not require or inspect any fields on assignment.
 message Assignment {
  // Connection information for this Assignment.
  string connection = 1;
--- a/api/query.proto
+++ b/api/query.proto
@ -79,8 +79,8 @@ message QueryTicketIdsResponse {
 service QueryService {
  // QueryTickets gets a list of Tickets that match all Filters of the input Pool.
  //   - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.
-  // QueryTickets pages the Tickets by `storage.pool.size` and stream back responses.
-  //   - storage.pool.size is default to 1000 if not set, and has a mininum of 10 and maximum of 10000.
+  // QueryTickets pages the Tickets by `queryPageSize` and stream back responses.
+  //   - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.
  rpc QueryTickets(QueryTicketsRequest) returns (stream QueryTicketsResponse) {
    option (google.api.http) = {
      post: "/v1/queryservice/tickets:query"
@ -90,8 +90,8 @@ service QueryService {

  // QueryTicketIds gets the list of TicketIDs that meet all the filtering criteria requested by the pool.
  //   - If the Pool contains no Filters, QueryTicketIds will return all TicketIDs in the state storage.
-  // QueryTicketIds pages the TicketIDs by `storage.pool.size` and stream back responses.
-  //   - storage.pool.size is default to 1000 if not set, and has a mininum of 10 and maximum of 10000.
+  // QueryTicketIds pages the TicketIDs by `queryPageSize` and stream back responses.
+  //   - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.
  rpc QueryTicketIds(QueryTicketIdsRequest) returns (stream QueryTicketIdsResponse) {
    option (google.api.http) = {
      post: "/v1/queryservice/ticketids:query"
--- a/api/query.swagger.json
+++ b/api/query.swagger.json
@ -26,7 +26,7 @@
  "paths": {
    "/v1/queryservice/ticketids:query": {
      "post": {
-        "summary": "QueryTicketIds gets the list of TicketIDs that meet all the filtering criteria requested by the pool.\n  - If the Pool contains no Filters, QueryTicketIds will return all TicketIDs in the state storage.\nQueryTicketIds pages the TicketIDs by `storage.pool.size` and stream back responses.\n  - storage.pool.size is default to 1000 if not set, and has a mininum of 10 and maximum of 10000.",
+        "summary": "QueryTicketIds gets the list of TicketIDs that meet all the filtering criteria requested by the pool.\n  - If the Pool contains no Filters, QueryTicketIds will return all TicketIDs in the state storage.\nQueryTicketIds pages the TicketIDs by `queryPageSize` and stream back responses.\n  - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.",
        "operationId": "QueryTicketIds",
        "responses": {
          "200": {
@ -60,7 +60,7 @@
    },
    "/v1/queryservice/tickets:query": {
      "post": {
-        "summary": "QueryTickets gets a list of Tickets that match all Filters of the input Pool.\n  - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.\nQueryTickets pages the Tickets by `storage.pool.size` and stream back responses.\n  - storage.pool.size is default to 1000 if not set, and has a mininum of 10 and maximum of 10000.",
+        "summary": "QueryTickets gets a list of Tickets that match all Filters of the input Pool.\n  - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.\nQueryTickets pages the Tickets by `queryPageSize` and stream back responses.\n  - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.",
        "operationId": "QueryTickets",
        "responses": {
          "200": {
@ -109,7 +109,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
+      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
    },
    "openmatchDoubleRangeFilter": {
      "type": "object",
@ -271,7 +271,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -287,10 +287,10 @@
        "create_time": {
          "type": "string",
          "format": "date-time",
-          "description": "Create time represents the time at which this Ticket was created. It is\npopulated by Open Match at the time of Ticket creation."
+          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
    },
    "protobufAny": {
      "type": "object",
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@ -153,7 +153,7 @@ steps:

 artifacts:
    objects:
-        location: gs://open-match-build-artifacts/output/
+        location: '${_ARTIFACTS_BUCKET}'
        paths:
            - install/yaml/install.yaml
            - install/yaml/01-open-match-core.yaml
@ -164,10 +164,12 @@ artifacts:
            - install/yaml/06-open-match-override-configmap.yaml
            
 substitutions:
-    _OM_VERSION: "0.0.0-dev"
+    _OM_VERSION: "1.1.0-rc.1"
    _GCB_POST_SUBMIT: "0"
    _GCB_LATEST_VERSION: "undefined"
-logsBucket: 'gs://open-match-build-logs/'
+    _ARTIFACTS_BUCKET: "gs://open-match-build-artifacts/output/"
+    _LOGS_BUCKET: "gs://open-match-build-logs/"
+logsBucket: '${_LOGS_BUCKET}'
 options:
  sourceProvenanceHash: ['SHA256']
  machineType: 'N1_HIGHCPU_32'
--- a/cmd/backend/backend.go
+++ b/cmd/backend/backend.go
@ -16,11 +16,10 @@
 package main

 import (
-	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/backend"
-	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/appmain"
 )

 func main() {
-	app.RunApplication("backend", config.Read, backend.BindService)
+	appmain.RunApplication("backend", backend.BindService)
 }
--- a/cmd/default-evaluator/main.go
+++ b/cmd/default-evaluator/main.go
@ -11,14 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package main

 import (
-	"open-match.dev/open-match/internal/app/evaluator"
 	"open-match.dev/open-match/internal/app/evaluator/defaulteval"
+	"open-match.dev/open-match/internal/appmain"
 )

 func main() {
-	// Invoke the harness to setup a GRPC service that handles requests to run the evaluator.
-	evaluator.RunEvaluator(defaulteval.Evaluate)
+	appmain.RunApplication("evaluator", defaulteval.BindService)
 }
--- a/cmd/frontend/frontend.go
+++ b/cmd/frontend/frontend.go
@ -16,11 +16,10 @@
 package main

 import (
-	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/frontend"
-	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/appmain"
 )

 func main() {
-	app.RunApplication("frontend", config.Read, frontend.BindService)
+	appmain.RunApplication("frontend", frontend.BindService)
 }
--- a/cmd/minimatch/main.go
+++ b/cmd/minimatch/main.go
@ -16,11 +16,10 @@
 package main

 import (
-	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/minimatch"
-	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/appmain"
 )

 func main() {
-	app.RunApplication("minimatch", config.Read, minimatch.BindService)
+	appmain.RunApplication("minimatch", minimatch.BindService)
 }
--- a/cmd/query/query.go
+++ b/cmd/query/query.go
@ -16,11 +16,10 @@
 package main

 import (
-	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/query"
-	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/appmain"
 )

 func main() {
-	app.RunApplication("query", config.Read, query.BindService)
+	appmain.RunApplication("query", query.BindService)
 }
--- a/cmd/scale-backend/main.go
+++ b/cmd/scale-backend/main.go
@ -16,10 +16,9 @@ package main

 import (
 	"open-match.dev/open-match/examples/scale/backend"
-	"open-match.dev/open-match/internal/app"
-	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/appmain"
 )

 func main() {
-	app.RunApplication("scale", config.Read, backend.BindService)
+	appmain.RunApplication("scale", backend.BindService)
 }
--- a/cmd/scale-frontend/main.go
+++ b/cmd/scale-frontend/main.go
@ -16,10 +16,9 @@ package main

 import (
 	"open-match.dev/open-match/examples/scale/frontend"
-	"open-match.dev/open-match/internal/app"
-	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/appmain"
 )

 func main() {
-	app.RunApplication("scale", config.Read, frontend.BindService)
+	appmain.RunApplication("scale", frontend.BindService)
 }
--- a/cmd/synchronizer/synchronizer.go
+++ b/cmd/synchronizer/synchronizer.go
@ -16,11 +16,10 @@
 package main

 import (
-	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/synchronizer"
-	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/appmain"
 )

 func main() {
-	app.RunApplication("synchronizer", config.Read, synchronizer.BindService)
+	appmain.RunApplication("synchronizer", synchronizer.BindService)
 }
--- a/docs/development.md
+++ b/docs/development.md
@ -9,14 +9,12 @@ To build Open Match you'll need the following applications installed.

 * [Git](https://git-scm.com/downloads)
 * [Go](https://golang.org/doc/install)
- * [Python3 with virtualenv](https://wiki.python.org/moin/BeginnersGuide/Download)
 * Make (Mac: install [XCode](https://itunes.apple.com/us/app/xcode/id497799835))
 * [Docker](https://docs.docker.com/install/) including the
   [post-install steps](https://docs.docker.com/install/linux/linux-postinstall/).

 Optional Software

- * [Google Cloud Platform](gcloud.md)
 * [Visual Studio Code](https://code.visualstudio.com/Download) for IDE.
   Vim and Emacs work to.
 * [VirtualBox](https://www.virtualbox.org/wiki/Downloads) recommended for
@ -27,8 +25,7 @@ running:

 ```bash
 sudo apt-get update
-sudo apt-get install -y -q python3 python3-virtualenv virtualenv make \
-  google-cloud-sdk git unzip tar
+sudo apt-get install -y -q make google-cloud-sdk git unzip tar
 ```

 *It's recommended that you install Go using their instructions because package
@ -51,13 +48,11 @@ make
 [create a fork](https://help.github.com/en/articles/fork-a-repo) and use that
 but for purpose of this guide we'll be using the upstream/master.*

-## Building
+## Building code and images

 ```bash
 # Reset workspace
 make clean
-# Compile all the binaries
-make all -j$(nproc)
 # Run tests
 make test
 # Build all the images.
@ -87,11 +82,9 @@ default context the Makefile will honor that._
 # GKE cluster: make create-gke-cluster/delete-gke-cluster
 # or create a local Minikube cluster
 make create-gke-cluster
-# Step 2: Download helm and install Tiller in the cluster
-make push-helm
-# Step 3: Build and Push Open Match Images to gcr.io
+# Step 2: Build and Push Open Match Images to gcr.io
 make push-images -j$(nproc)
-# Install Open Match in the cluster.
+# Step 3: Install Open Match in the cluster.
 make install-chart

 # Create a proxy to Open Match pods so that you can access them locally.
@ -105,12 +98,29 @@ make proxy
 make delete-chart
 ```

-## Interaction
+## Iterating
+While iterating on the project, you may need to:
+1. Install/Run everything
+2. Make some code changes
+3. Make sure the changes compile by running `make test`
+4. Build and push Docker images to your personal registry by running `make push-images -j$(nproc)`
+5. Deploy the code change by running `make install-chart`
+6. Verify it's working by [looking at the logs](#accessing-logs) or looking at the monitoring dashboard by running `make proxy-grafana`
+7. Tear down Open Match by running `make delete-chart`

-Before integrating with Open Match you can manually interact with it to get a feel for how it works.
+## Accessing logs
+To look at Open Match core services' logs, run:
+```bash
+# Replace open-match-frontend with the service name that you would like to access
+kubectl logs -n open-match svc/open-match-frontend
+```

-`make proxy-ui` exposes the Swagger UI for Open Match locally on your computer.
-You can then go to http://localhost:51500 and view the API as well as interactively call Open Match.
+## API References
+While integrating with Open Match you may want to understand its API surface concepts or interact with it and get a feel for how it works.
+
+The APIs are defined in `proto` format under the `api/` folder, with references available at [open-match.dev](https://open-match.dev/site/docs/reference/api/).
+
+You can also run `make proxy-ui` to exposes the Swagger UI for Open Match locally on your computer after [deploying it to Kubernetes](#deploying-to-kubernetes), then go to http://localhost:51500 and view the REST APIs as well as interactively call Open Match.

 By default you will be talking to the frontend server but you can change the target API url to any of the following:

@ -144,55 +154,9 @@ export GOPATH=$HOME/workspace/

 ## Pull Requests

-If you want to submit a Pull Request there's some tools to help prepare your
-change.
-
-```bash
-# Runs code generators, tests, and linters.
-make presubmit
-```
-
-`make presubmit` catches most of the issues your change can run into. If the
-submit checks fail you can run it locally via,
-
-```bash
-make local-cloud-build
-```
+If you want to submit a Pull Request, `make presubmit` can catch most of the issues your change can run into.

 Our [continuous integration](https://console.cloud.google.com/cloud-build/builds?project=open-match-build)
 runs against all PRs. In order to see your build results you'll need to
 become a member of
 [open-match-discuss@googlegroups.com](https://groups.google.com/forum/#!forum/open-match-discuss).
-
-
-## Makefile
-
-The Makefile is the core of Open Match's build process. There's a lot of
-commands but here's a list of the important ones and patterns to remember them.
-
-```bash
-# Help
-make
-
-# Reset workspace (delete all build artifacts)
-make clean
-# Delete auto-generated protobuf code and swagger API docs.
-make clean-protos clean-swagger-docs
-# make clean-* deletes some part of the build outputs.
-
-# Build all Docker images
-make build-images
-# Build frontend docker image.
-make build-frontend-image
-
-# Formats, Vets, and tests the codebase.
-make fmt vet test
-# Same as above also regenerates autogen files.
-make presubmit
-
-# Run website on http://localhost:8080
-make run-site
-
-# Proxy all Open Match processes to view them.
-make proxy
-```
--- a/docs/governance/templates/release.sh
+++ b/docs/governance/templates/release.sh
@ -12,24 +12,13 @@ SOURCE_VERSION=$1
 DEST_VERSION=$2
 SOURCE_PROJECT_ID=open-match-build
 DEST_PROJECT_ID=open-match-public-images
-IMAGE_NAMES="openmatch-backend openmatch-frontend openmatch-query openmatch-synchronizer openmatch-minimatch openmatch-demo-first-match openmatch-mmf-go-soloduel openmatch-mmf-go-pool openmatch-evaluator-go-simple openmatch-swaggerui openmatch-reaper"
+IMAGE_NAMES=$(make list-images)

 for name in $IMAGE_NAMES
 do
-    source_image=gcr.io/$SOURCE_PROJECT_ID/$name:$SOURCE_VERSION
-    dest_image=gcr.io/$DEST_PROJECT_ID/$name:$DEST_VERSION
+    source_image=gcr.io/$SOURCE_PROJECT_ID/openmatch-$name:$SOURCE_VERSION
+    dest_image=gcr.io/$DEST_PROJECT_ID/openmatch-$name:$DEST_VERSION
    docker pull $source_image
    docker tag $source_image $dest_image
    docker push $dest_image
 done
-
-echo "=============================================================="
-echo "=============================================================="
-echo "=============================================================="
-echo "=============================================================="
-
-echo "Add these lines to your release notes:"
-for name in $IMAGE_NAMES
-do
-    echo "docker pull gcr.io/$DEST_PROJECT_ID/$name:$DEST_VERSION"
-done
--- a/docs/hugo_apiheader.txt
+++ b/docs/hugo_apiheader.txt
@ -0,0 +1,7 @@
+---
+title: "Open Match API References" 
+linkTitle: "Open Match API References" 
+weight: 2 
+description: 
+  This document provides API references for Open Match services. 
+---
--- a/examples/demo/components/clients/clients.go
+++ b/examples/demo/components/clients/clients.go
@ -81,7 +81,7 @@ func runScenario(ctx context.Context, name string, update updater.SetFunc) {
 	update(s)

 	// See https://open-match.dev/site/docs/guides/api/
-	conn, err := grpc.Dial("om-frontend.open-match.svc.cluster.local:50504", grpc.WithInsecure())
+	conn, err := grpc.Dial("open-match-frontend.open-match.svc.cluster.local:50504", grpc.WithInsecure())
 	if err != nil {
 		panic(err)
 	}
--- a/examples/demo/components/director/director.go
+++ b/examples/demo/components/director/director.go
@ -68,7 +68,7 @@ func run(ds *components.DemoShared) {
 	ds.Update(s)

 	// See https://open-match.dev/site/docs/guides/api/
-	conn, err := grpc.Dial("om-backend.open-match.svc.cluster.local:50505", grpc.WithInsecure())
+	conn, err := grpc.Dial("open-match-backend.open-match.svc.cluster.local:50505", grpc.WithInsecure())
 	if err != nil {
 		panic(err)
 	}
--- a/examples/functions/golang/soloduel/main.go
+++ b/examples/functions/golang/soloduel/main.go
@ -24,8 +24,8 @@ import (
 )

 const (
-	queryServiceAddr = "om-query.open-match.svc.cluster.local:50503" // Address of the QueryService endpoint.
-	serverPort       = 50502                                         // The port for hosting the Match Function.
+	queryServiceAddr = "open-match-query.open-match.svc.cluster.local:50503" // Address of the QueryService endpoint.
+	serverPort       = 50502                                                 // The port for hosting the Match Function.
 )

 func main() {
--- a/examples/functions/golang/soloduel/mmf/matchfunction_test.go
+++ b/examples/functions/golang/soloduel/mmf/matchfunction_test.go
@ -19,11 +19,11 @@ import (

 	"open-match.dev/open-match/pkg/pb"

-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )

 func TestMakeMatchesDeduplicate(t *testing.T) {
-	assert := assert.New(t)
+	require := require.New(t)

 	poolNameToTickets := map[string][]*pb.Ticket{
 		"pool1": {{Id: "1"}},
@ -31,12 +31,12 @@ func TestMakeMatchesDeduplicate(t *testing.T) {
 	}

 	matches, err := makeMatches(poolNameToTickets)
-	assert.Nil(err)
-	assert.Equal(len(matches), 0)
+	require.Nil(err)
+	require.Equal(len(matches), 0)
 }

 func TestMakeMatches(t *testing.T) {
-	assert := assert.New(t)
+	require := require.New(t)

 	poolNameToTickets := map[string][]*pb.Ticket{
 		"pool1": {{Id: "1"}, {Id: "2"}, {Id: "3"}},
@ -45,11 +45,11 @@ func TestMakeMatches(t *testing.T) {
 	}

 	matches, err := makeMatches(poolNameToTickets)
-	assert.Nil(err)
-	assert.Equal(len(matches), 3)
+	require.Nil(err)
+	require.Equal(len(matches), 3)

 	for _, match := range matches {
-		assert.Equal(2, len(match.Tickets))
-		assert.Equal(matchName, match.MatchFunction)
+		require.Equal(2, len(match.Tickets))
+		require.Equal(matchName, match.MatchFunction)
 	}
 }
--- a/examples/scale/backend/backend.go
+++ b/examples/scale/backend/backend.go
@ -25,6 +25,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 	"open-match.dev/open-match/examples/scale/scenarios"
+	"open-match.dev/open-match/internal/appmain"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/telemetry"
@ -53,8 +54,8 @@ var (

 // Run triggers execution of functions that continuously fetch, assign and
 // delete matches.
-func BindService(p *rpc.ServerParams, cfg config.View) error {
-	go run(cfg)
+func BindService(p *appmain.Params, b *appmain.Bindings) error {
+	go run(p.Config())
 	return nil
 }

--- a/examples/scale/frontend/frontend.go
+++ b/examples/scale/frontend/frontend.go
@ -24,6 +24,7 @@ import (
 	"go.opencensus.io/stats"
 	"go.opencensus.io/trace"
 	"open-match.dev/open-match/examples/scale/scenarios"
+	"open-match.dev/open-match/internal/appmain"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/telemetry"
@ -45,8 +46,8 @@ var (

 // Run triggers execution of the scale frontend component that creates
 // tickets at scale in Open Match.
-func BindService(p *rpc.ServerParams, cfg config.View) error {
-	go run(cfg)
+func BindService(p *appmain.Params, b *appmain.Bindings) error {
+	go run(p.Config())

 	return nil
 }
--- a/examples/scale/mmf/mmf.go
+++ b/examples/scale/mmf/mmf.go
@ -39,7 +39,7 @@ var (
 func Run() {
 	activeScenario := scenarios.ActiveScenario

-	conn, err := grpc.Dial("om-query.open-match.svc.cluster.local:50503", utilTesting.NewGRPCDialOptions(logger)...)
+	conn, err := grpc.Dial("open-match-query.open-match.svc.cluster.local:50503", utilTesting.NewGRPCDialOptions(logger)...)
 	if err != nil {
 		logger.Fatalf("Failed to connect to Open Match, got %v", err)
 	}
--- a/examples/scale/scenarios/scenarios.go
+++ b/examples/scale/scenarios/scenarios.go
@ -28,7 +28,7 @@ import (
 )

 var (
-	queryServiceAddress = "om-query.open-match.svc.cluster.local:50503" // Address of the QueryService Endpoint.
+	queryServiceAddress = "open-match-query.open-match.svc.cluster.local:50503" // Address of the QueryService Endpoint.

 	logger = logrus.WithFields(logrus.Fields{
 		"app": "scale",
--- a/go.mod
+++ b/go.mod
@ -45,6 +45,7 @@ require (
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v1.2.1
+	github.com/pseudomuto/protoc-gen-doc v1.3.2 // indirect
 	github.com/rs/xid v1.2.1
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/afero v1.2.1 // indirect
--- a/go.sum
+++ b/go.sum
@ -27,6 +27,10 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/FZambia/sentinel v1.0.0 h1:KJ0ryjKTZk5WMp0dXvSdNqp3lFaW1fNFuEYfrkLOYIc=
 github.com/FZambia/sentinel v1.0.0/go.mod h1:ytL1Am/RLlAoAXG6Kj5LNuw/TRRQrv2rt2FT26vP5gI=
+github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
+github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/sprig v2.15.0+incompatible h1:0gSxPGWS9PAr7U2NsQ2YQg6juRDINkUyuvbb4b2Xm8w=
+github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
@ -41,6 +45,8 @@ github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGn
 github.com/alicebob/miniredis/v2 v2.11.0 h1:Dz6uJ4w3Llb1ZiFoqyzF9aLuzbsEWCeKwstu9MzmSAk=
 github.com/alicebob/miniredis/v2 v2.11.0/go.mod h1:UA48pmi7aSazcGAvcdKcBB49z521IC9VjTTRz2nIaJE=
 github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
+github.com/aokoli/goutils v1.0.1 h1:7fpzNGoJ3VA8qcrm++XEE1QUe0mIwNeLa02Nwq7RDkg=
+github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@ -69,6 +75,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -79,6 +86,8 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@ -106,6 +115,7 @@ github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4er
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
@ -128,6 +138,7 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@ -153,6 +164,9 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/huandu/xstrings v1.0.0 h1:pO2K/gKgKaat5LdpAhxhluX2GPQMaI3W5FUz/I/UnWk=
+github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
+github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
@ -191,6 +205,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007 h1:28i1IjGcx8AofiB4N3q5Yls55VEaitzuEPkFJEVgGkA=
+github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@ -207,6 +223,7 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@ -236,6 +253,10 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8=
 github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/pseudomuto/protoc-gen-doc v1.3.2 h1:61vWZuxYa8D7Rn4h+2dgoTNqnluBmJya2MgbqO32z6g=
+github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA=
+github.com/pseudomuto/protokit v0.2.0 h1:hlnBDcy3YEDXH7kc9gV+NLaN0cDzhDvD1s7Y6FZ8RpM=
+github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@ -262,6 +283,7 @@ github.com/spf13/viper v1.5.0 h1:GpsTwfsQ27oS/Aha/6d1oD7tpKIqWnOA6tgOX9HHkt4=
 github.com/spf13/viper v1.5.0/go.mod h1:AkYRkVJF8TkSG/xet6PzXX+l39KhhXa2pdqVSxnTcn4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
@ -284,6 +306,7 @@ go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@ -338,6 +361,7 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -406,6 +430,7 @@ google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww
 google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
--- a/install/helm/open-match/Chart.yaml
+++ b/install/helm/open-match/Chart.yaml
@ -13,8 +13,8 @@
 # limitations under the License.

 apiVersion: v2
-appVersion: "0.0.0-dev"
-version: 0.0.0-dev
+appVersion: "1.1.0-rc.1"
+version: 1.1.0-rc.1
 name: open-match
 dependencies:
  - name: redis
--- a/install/helm/open-match/subcharts/open-match-customize/templates/_helpers.tpl
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/_helpers.tpl
@ -0,0 +1,20 @@
+{*
+ Copyright 2019 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*}
+
+{{/* vim: set filetype=mustache: */}}
+{{- define "openmatchcustomize.function.hostName" -}}
+{{- .Values.function.hostName | default (printf "%s-function" (include "openmatch.fullname" . ) ) -}}
+{{- end -}}
--- a/install/helm/open-match/subcharts/open-match-customize/templates/customize-configmap.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/customize-configmap.yaml
@ -1,41 +0,0 @@
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: customize-configmap
-  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    component: config
-    release: {{ .Release.Name }}
-data:
-  matchmaker_config_default.yaml: |-
-    api:
-      functions:
-        hostname: "{{ .Values.function.hostName }}"
-        grpcport: "{{ .Values.function.grpcPort }}"
-        httpport: "{{ .Values.function.httpPort }}"
-      
-      evaluator:
-        hostname: "{{ .Values.evaluator.hostName }}"
-        grpcport: "{{ .Values.evaluator.grpcPort }}"
-        httpport: "{{ .Values.evaluator.httpPort }}"    
-  matchmaker_config_override.yaml: |-
-    api:
-      query:
-        hostname: "{{ .Values.query.hostName }}.{{ .Release.Namespace }}.svc.cluster.local"
-        grpcport: "{{ .Values.query.grpcPort }}"
--- a/install/helm/open-match/subcharts/open-match-customize/templates/evaluator.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/evaluator.yaml
@ -18,7 +18,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.evaluator.hostName }}
+  name: {{ include "openmatch.evaluator.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -46,20 +46,20 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ .Values.evaluator.hostName }}
+  name: {{ include "openmatch.evaluator.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ .Values.evaluator.hostName }}
+    name: {{ include "openmatch.evaluator.hostName" . }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.evaluator.hostName }}
+  name: {{ include "openmatch.evaluator.hostName" . }}
  namespace: {{ .Release.Namespace }}
  labels:
    app: {{ template "openmatch.name" . }}
@ -83,11 +83,11 @@ spec:
        release: {{ .Release.Name }}
    spec:
      volumes:
-        {{- include "openmatch.volumes.configs" (dict "configs" .Values.evaluatorConfigs) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.evaluatorConfigs)) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
+      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
      containers:
-      - name: {{ .Values.evaluator.hostName }}
+      - name: {{ include "openmatch.evaluator.hostName" . }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.evaluatorConfigs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/subcharts/open-match-customize/templates/matchfunctions.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/matchfunctions.yaml
@ -18,7 +18,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.function.hostName }}
+  name: {{ include "openmatchcustomize.function.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -46,20 +46,20 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ .Values.function.hostName }}
+  name: {{ include "openmatchcustomize.function.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ .Values.function.hostName }}
+    name: {{ include "openmatchcustomize.function.hostName" . }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.function.hostName }}
+  name: {{ include "openmatchcustomize.function.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -84,11 +84,11 @@ spec:
        release: {{ .Release.Name }}
    spec:
      volumes:
-        {{- include "openmatch.volumes.configs" (dict "configs" .Values.mmfConfigs) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.mmfConfigs)) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
+      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
      containers:
-      - name: {{ .Values.function.hostName }}
+      - name: {{ include "openmatchcustomize.function.hostName" . }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.mmfConfigs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/subcharts/open-match-customize/values.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/values.yaml
@ -35,11 +35,13 @@ evaluatorConfigs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    configName: customize-configmap
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.default" . }}'
  customize:
-    volumeName: customize-config-volume
+    volumeName: om-config-volume-override
    mountPath: /app/config/override
-    configName: customize-configmap
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.override" . }}'

 mmfConfigs:
  # We use harness to implement the MMFs. MMF itself only requires one configmap but harness expects two,
@ -48,8 +50,10 @@ mmfConfigs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    configName: customize-configmap
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.default" . }}'
  customize:
-    volumeName: customize-config-volume
+    volumeName: om-config-volume-override
    mountPath: /app/config/override
-    configName: customize-configmap
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.override" . }}'
--- a/install/helm/open-match/subcharts/open-match-scale/templates/_helpers.tpl
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/_helpers.tpl
@ -0,0 +1,42 @@
+{*
+ Copyright 2019 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*}
+
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "openmatchscale.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- define "openmatchscale.scaleBackend.hostName" -}}
+{{- .Values.scaleBackend.hostName | default (printf "%s-backend" (include "openmatchscale.fullname" . ) ) -}}
+{{- end -}}
+
+{{- define "openmatchscale.scaleFrontend.hostName" -}}
+{{- .Values.scaleFrontend.hostName | default (printf "%s-frontend" (include "openmatchscale.fullname" . ) ) -}}
+{{- end -}}
--- a/install/helm/open-match/subcharts/open-match-scale/templates/scale-backend.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/scale-backend.yaml
@ -15,7 +15,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.scaleBackend.hostName }}
+  name: {{ include "openmatchscale.scaleBackend.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -34,7 +34,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.scaleBackend.hostName }}
+  name: {{ include "openmatchscale.scaleBackend.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -59,11 +59,11 @@ spec:
        release: {{ .Release.Name }}
    spec:
      volumes:
-        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
+      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
      containers:
-      - name: {{ .Values.scaleBackend.hostName }}
+      - name: {{ include "openmatchscale.scaleBackend.hostName" . }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/subcharts/open-match-scale/templates/scale-frontend.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/scale-frontend.yaml
@ -15,7 +15,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.scaleFrontend.hostName }}
+  name: {{ include "openmatchscale.scaleFrontend.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -34,7 +34,7 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ .Values.scaleFrontend.hostName }}
+  name: {{ include "openmatchscale.scaleFrontend.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -59,11 +59,11 @@ spec:
        release: {{ .Release.Name }}
    spec:
      volumes:
-        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
+      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
      containers:
-      - name: {{ .Values.scaleFrontend.hostName }}
+      - name: {{ include "openmatchscale.scaleFrontend.hostName" . }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/subcharts/open-match-scale/templates/scale-grafana-dashboard.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/scale-grafana-dashboard.yaml
@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: open-match-scale-dashboard
+  name: {{ include "openmatchscale.fullname" . }}-dashboard
  namespace: {{ .Release.Namespace }}
  labels:
     grafana_dashboard: "1"
--- a/install/helm/open-match/subcharts/open-match-scale/values.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/values.yaml
@ -13,13 +13,13 @@
 # limitations under the License.

 scaleFrontend:
-  hostName: om-scale-frontend
+  hostName:
  httpPort: 51509
  replicas: 1
  image: openmatch-scale-frontend

 scaleBackend:
-  hostName: om-scale-backend
+  hostName:
  httpPort: 51509
  replicas: 1
  image: openmatch-scale-backend
@ -28,8 +28,10 @@ configs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    configName: om-configmap-default
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.default" . }}'
  override:
    volumeName: om-config-volume-override
    mountPath: /app/config/override
-    configName: om-configmap-override
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.override" . }}'
--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/go-processes.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/go-processes.json
@ -62,7 +62,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (pod_name) (\n  sum(\n    rate(container_cpu_usage_seconds_total{pod_name=~\"om-.*\", container_name!=\"POD\"}[5m])\n  ) by (pod_name, container_name) \n  \n  /\n  \n  sum(\n    container_spec_cpu_quota{pod_name=~\"om-.*\", container_name!=\"POD\"} / container_spec_cpu_period{pod_name=~\"om-.*\", container_name!=\"POD\"}\n  ) by (pod_name, container_name) \n  \n  * \n  \n  100\n)",
+          "expr": "avg by (pod_name) (\n\nsum(\n  rate(container_cpu_usage_seconds_total{container_name!=\"POD\"}[5m]) * on (pod_name) group_left(label_app) max by (pod_name, label_app) (label_replace(kube_pod_labels{label_app=\"open-match\"}, \"pod_name\", \"$1\", \"pod\", \"(.*)\"))\n) by (pod_name, container_name)\n\n/\n\nsum(\n  (container_spec_cpu_quota{container_name!=\"POD\"} * on (pod_name) group_left(label_app) max by (pod_name, label_app) (label_replace(kube_pod_labels{label_app=\"open-match\"}, \"pod_name\", \"$1\", \"pod\", \"(.*)\")))\n  /\n  (container_spec_cpu_period{container_name!=\"POD\"} * on (pod_name) group_left(label_app) max by (pod_name, label_app) (label_replace(kube_pod_labels{label_app=\"open-match\"}, \"pod_name\", \"$1\", \"pod\", \"(.*)\")))\n) by (pod_name, container_name)\n\n*\n\n100\n)\n",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "{{pod_name}}",
@ -155,7 +155,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (go_goroutines{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
+          "expr": "avg by (component) (go_goroutines{app=~\"open-match\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}}",
@ -256,7 +256,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component,app) (process_resident_memory_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
+          "expr": "avg by (component,app) (process_resident_memory_bytes{app=~\"open-match\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - resident",
@ -265,7 +265,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component,app) (process_virtual_memory_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
+          "expr": "avg by (component,app) (process_virtual_memory_bytes{app=~\"open-match\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - virtual",
@ -365,7 +365,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (deriv(process_resident_memory_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
+          "expr": "avg by (component) (deriv(process_resident_memory_bytes{app=~\"open-match\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - resident",
@ -374,7 +374,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (deriv(process_virtual_memory_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
+          "expr": "avg by (component) (deriv(process_virtual_memory_bytes{app=~\"open-match\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - virtual",
@ -475,7 +475,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (go_memstats_alloc_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
+          "expr": "avg by (component) (go_memstats_alloc_bytes{app=~\"open-match\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - bytes allocated",
@ -484,7 +484,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (rate(go_memstats_alloc_bytes_total{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
+          "expr": "avg by (component) (rate(go_memstats_alloc_bytes_total{app=~\"open-match\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - alloc rate",
@ -493,7 +493,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (go_memstats_stack_inuse_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
+          "expr": "avg by (component) (go_memstats_stack_inuse_bytes{app=~\"open-match\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - stack inuse",
@ -502,7 +502,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (go_memstats_heap_inuse_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
+          "expr": "avg by (component) (go_memstats_heap_inuse_bytes{app=~\"open-match\"})",
          "format": "time_series",
          "hide": false,
          "intervalFactor": 2,
@ -604,7 +604,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (deriv(go_memstats_alloc_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
+          "expr": "avg by (component) (deriv(go_memstats_alloc_bytes{app=~\"open-match\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - bytes allocated",
@ -613,7 +613,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (deriv(go_memstats_stack_inuse_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
+          "expr": "avg by (component) (deriv(go_memstats_stack_inuse_bytes{app=~\"open-match\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - stack inuse",
@ -622,7 +622,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (deriv(go_memstats_heap_inuse_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
+          "expr": "avg by (component) (deriv(go_memstats_heap_inuse_bytes{app=~\"open-match\"}[$interval]))",
          "format": "time_series",
          "hide": false,
          "intervalFactor": 2,
@ -719,7 +719,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (process_open_fds{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
+          "expr": "avg by (component) (process_open_fds{app=~\"open-match\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}}",
@ -815,7 +815,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (deriv(process_open_fds{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
+          "expr": "avg by (component) (deriv(process_open_fds{app=~\"open-match\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}}",
@ -911,7 +911,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component, quantile) (go_gc_duration_seconds{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
+          "expr": "avg by (component, quantile) (go_gc_duration_seconds{app=~\"open-match\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}}: {{quantile}}",
--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/match-making.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/match-making.json
--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/redis.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/redis.json
@ -348,14 +348,14 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "sum(rate(container_cpu_usage_seconds_total{pod_name=~\"om-redis.*\", name!~\".*prometheus.*\", image!=\"\", container_name!=\"POD\"}[5m])) by (pod_name)",
+          "expr": "sum(rate(container_cpu_usage_seconds_total{name!~\".*prometheus.*\", image!=\"\", container_name!=\"POD\"}[5m]) * on (pod_name) group_left(label_app) max by (pod_name, label_app) (label_replace(kube_pod_labels{label_app=\"redis\"}, \"pod_name\", \"$1\", \"pod\", \"(.*)\"))) by (pod_name)",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "{{pod_name}} usage",
          "refId": "A"
        },
        {
-          "expr": "sum(kube_pod_container_resource_limits_cpu_cores{pod=~\"om-redis.*\"}) by (pod)",
+          "expr": "sum(kube_pod_container_resource_limits_cpu_cores * on (pod) group_left(label_app) max by (pod, label_app) (kube_pod_labels{label_app=\"redis\"})) by (pod)",
          "format": "time_series",
          "hide": false,
          "intervalFactor": 1,
@ -363,7 +363,7 @@
          "refId": "B"
        },
        {
-          "expr": "sum(kube_pod_container_resource_requests_cpu_cores{pod=~\"om-redis.*\"}) by (pod)",
+          "expr": "sum(kube_pod_container_resource_requests_cpu_cores * on (pod) group_left(label_app) max by (pod, label_app) (kube_pod_labels{label_app=\"redis\"})) by (pod)",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "request",
--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/tickets.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/tickets.json
@ -1,290 +0,0 @@
-{
-    "annotations": {
-      "list": [
-        {
-          "builtIn": 1,
-          "datasource": "-- Grafana --",
-          "enable": true,
-          "hide": true,
-          "iconColor": "rgba(0, 211, 255, 1)",
-          "name": "Annotations & Alerts",
-          "type": "dashboard"
-        }
-      ]
-    },
-    "editable": true,
-    "gnetId": null,
-    "graphTooltip": 0,
-    "id": 3,
-    "iteration": 1562886170229,
-    "links": [],
-    "panels": [
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "fill": 1,
-        "gridPos": {
-          "h": 9,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "id": 2,
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {},
-        "percentage": false,
-        "pointradius": 2,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(rate(frontend_tickets_created[$timewindow]))",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "Created",
-            "refId": "A"
-          },
-          {
-            "expr": "sum(rate(frontend_tickets_deleted[$timewindow]))",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "Deleted",
-            "refId": "B"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Ticket Flow",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      },
-      {
-        "aliasColors": {},
-        "bars": false,
-        "dashLength": 10,
-        "dashes": false,
-        "description": "",
-        "fill": 1,
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "id": 4,
-        "interval": "",
-        "legend": {
-          "avg": false,
-          "current": false,
-          "max": false,
-          "min": false,
-          "show": true,
-          "total": false,
-          "values": false
-        },
-        "lines": true,
-        "linewidth": 1,
-        "links": [],
-        "nullPointMode": "null",
-        "options": {},
-        "percentage": false,
-        "pointradius": 2,
-        "points": false,
-        "renderer": "flot",
-        "seriesOverrides": [],
-        "spaceLength": 10,
-        "stack": false,
-        "steppedLine": false,
-        "targets": [
-          {
-            "expr": "sum(rate(frontend_tickets_assignments_retrieved[$timewindow]))",
-            "format": "time_series",
-            "intervalFactor": 1,
-            "legendFormat": "Assignments Retrieved",
-            "refId": "A"
-          }
-        ],
-        "thresholds": [],
-        "timeFrom": null,
-        "timeRegions": [],
-        "timeShift": null,
-        "title": "Assignments",
-        "tooltip": {
-          "shared": true,
-          "sort": 0,
-          "value_type": "individual"
-        },
-        "type": "graph",
-        "xaxis": {
-          "buckets": null,
-          "mode": "time",
-          "name": null,
-          "show": true,
-          "values": []
-        },
-        "yaxes": [
-          {
-            "decimals": null,
-            "format": "reqps",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": "0",
-            "show": true
-          },
-          {
-            "format": "short",
-            "label": null,
-            "logBase": 1,
-            "max": null,
-            "min": null,
-            "show": true
-          }
-        ],
-        "yaxis": {
-          "align": false,
-          "alignLevel": null
-        }
-      }
-    ],
-    "schemaVersion": 18,
-    "style": "dark",
-    "tags": [],
-    "templating": {
-      "list": [
-        {
-          "allValue": null,
-          "current": {
-            "text": "5m",
-            "value": "5m"
-          },
-          "hide": 0,
-          "includeAll": false,
-          "label": "Time Window",
-          "multi": false,
-          "name": "timewindow",
-          "options": [
-            {
-              "selected": true,
-              "text": "5m",
-              "value": "5m"
-            },
-            {
-              "selected": false,
-              "text": "10m",
-              "value": "10m"
-            },
-            {
-              "selected": false,
-              "text": "15m",
-              "value": "15m"
-            },
-            {
-              "selected": false,
-              "text": "30m",
-              "value": "30m"
-            },
-            {
-              "selected": false,
-              "text": "1h",
-              "value": "1h"
-            },
-            {
-              "selected": false,
-              "text": "4h",
-              "value": "4h"
-            }
-          ],
-          "query": "5m,10m,15m,30m,1h,4h",
-          "skipUrlSync": false,
-          "type": "custom"
-        }
-      ]
-    },
-    "time": {
-      "from": "now-6h",
-      "to": "now"
-    },
-    "timepicker": {
-      "refresh_intervals": [
-        "5s",
-        "10s",
-        "30s",
-        "1m",
-        "5m",
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
-    "timezone": "",
-    "title": "Tickets",
-    "uid": "TlgyFfIWz",
-    "version": 6
-  }
--- a/install/helm/open-match/subcharts/open-match-telemetry/templates/default-grafana-dashboards.yaml
+++ b/install/helm/open-match/subcharts/open-match-telemetry/templates/default-grafana-dashboards.yaml
@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: open-match-dashboards
+  name: {{ include "openmatch.fullname" . }}-dashboards
  labels:
     grafana_dashboard: "1"
 data:
--- a/install/helm/open-match/subcharts/open-match-telemetry/templates/default-grafana-datasource.yaml
+++ b/install/helm/open-match/subcharts/open-match-telemetry/templates/default-grafana-datasource.yaml
@ -1,4 +1,4 @@
-# Copyright 2019 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@ -12,13 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM open-match-base-build as builder
-
-WORKDIR /go/src/open-match.dev/open-match/test/matchfunction
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o matchfunction .
-
-FROM gcr.io/distroless/static:nonroot
-WORKDIR /app/
-COPY --from=builder --chown=nonroot /go/src/open-match.dev/open-match/test/matchfunction/matchfunction /app/
-
-ENTRYPOINT ["/app/matchfunction"]
+{{- if .Values.global.telemetry.grafana.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "openmatch.fullname" . }}-datasource
+  labels:
+     grafana_datasource: "1"
+data:
+    datasource.yaml: |-
+      apiVersion: 1
+      datasources:
+      - name: Prometheus
+        type: prometheus
+        url: {{ tpl .Values.global.telemetry.grafana.prometheusServer . }}
+        access: proxy
+        isDefault: true
+{{- end }}
--- a/install/helm/open-match/subcharts/open-match-telemetry/values.yaml
+++ b/install/helm/open-match/subcharts/open-match-telemetry/values.yaml
@ -142,17 +142,10 @@ grafana:
  notifiers: {}
  sidecar:
    dashboards:
-        enabled: true
+      enabled: true
+    datasources:
+      enabled: true
  plugins: grafana-piechart-panel
-  datasources:
-    datasources.yaml:
-      apiVersion: 1
-      datasources:
-      - name: Prometheus
-        type: prometheus
-        url: http://open-match-prometheus-server.{{ .Release.Namespace }}.svc.cluster.local:80/
-        access: proxy
-        isDefault: true

 jaeger:
  enabled: true
--- a/install/helm/open-match/templates/_helpers.tpl
+++ b/install/helm/open-match/templates/_helpers.tpl
@ -22,6 +22,26 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+Instead of .Chart.Name, we hard-code "open-match" as we need to call this from subcharts, but get the
+same result as if called from this chart.
+*/}}
+{{- define "openmatch.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default "open-match" .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
 {{/*
 Render chart metadata labels: "chart", "heritage" unless "openmatch.noChartMeta" is set.
 */}}
@ -57,7 +77,7 @@ resources:
 {{- range $configIndex, $configValues := .configs }}
 - name: {{ $configValues.volumeName }}
  configMap:
-    name: {{ $configValues.configName }}
+    name: {{ tpl $configValues.configName $ }}
 {{- end }}
 {{- end -}}

@ -74,10 +94,10 @@ resources:
 {{- if .Values.global.tls.enabled }}
 - name: tls-server-volume
  secret:
-    secretName: om-tls-server
+    secretName: {{ include "openmatch.fullname" . }}-tls-server
 - name: root-ca-volume
  secret:
-    secretName: om-tls-rootca
+    secretName: {{ include "openmatch.fullname" . }}-tls-rootca
 {{- end -}}
 {{- end -}}

@ -92,7 +112,7 @@ resources:
 {{- if .Values.redis.usePassword }}
 - name: redis-password
  secret:
-    secretName: {{ .Values.redis.fullnameOverride }}
+    secretName: {{ include "call-nested" (list . "redis" "redis.fullname") }}
 {{- end -}}
 {{- end -}}

@ -135,3 +155,72 @@ minReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.minReplicas }}
 maxReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.maxReplicas }}
 targetCPUUtilizationPercentage: {{ .Values.global.kubernetes.horizontalPodAutoScaler.targetCPUUtilizationPercentage }}
 {{- end -}}
+
+{{- define "openmatch.serviceAccount.name" -}}
+{{- .Values.global.kubernetes.serviceAccount | default (printf "%s-unprivileged-service" (include "openmatch.fullname" . ) ) -}}
+{{- end -}}
+
+{{- define "openmatch.swaggerui.hostName" -}}
+{{- .Values.swaggerui.hostName | default (printf "%s-swaggerui" (include "openmatch.fullname" . ) ) -}}
+{{- end -}}
+
+{{- define "openmatch.query.hostName" -}}
+{{- .Values.query.hostName | default (printf "%s-query" (include "openmatch.fullname" . ) ) -}}
+{{- end -}}
+
+{{- define "openmatch.frontend.hostName" -}}
+{{- .Values.frontend.hostName | default (printf "%s-frontend" (include "openmatch.fullname" . ) ) -}}
+{{- end -}}
+
+{{- define "openmatch.backend.hostName" -}}
+{{- .Values.backend.hostName | default (printf "%s-backend" (include "openmatch.fullname" . ) ) -}}
+{{- end -}}
+
+{{- define "openmatch.synchronizer.hostName" -}}
+{{- .Values.synchronizer.hostName | default (printf "%s-synchronizer" (include "openmatch.fullname" . ) ) -}}
+{{- end -}}
+
+{{- define "openmatch.evaluator.hostName" -}}
+{{- .Values.evaluator.hostName | default (printf "%s-evaluator" (include "openmatch.fullname" . ) ) -}}
+{{- end -}}
+
+{{- define "openmatch.configmap.default" -}}
+{{- printf "%s-configmap-default" (include "openmatch.fullname" . ) -}}
+{{- end -}}
+
+{{- define "openmatch.configmap.override" -}}
+{{- printf "%s-configmap-override" (include "openmatch.fullname" . ) -}}
+{{- end -}}
+
+{{- define "openmatch.jaeger.agent" -}}
+{{- if index .Values "open-match-telemetry" "enabled" -}}
+{{- if index .Values "open-match-telemetry" "jaeger" "enabled" -}}
+{{ include "call-nested" (list . "open-match-telemetry.jaeger" "jaeger.agent.name") }}:6831
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "openmatch.jaeger.collector" -}}
+{{- if index .Values "open-match-telemetry" "enabled" -}}
+{{- if index .Values "open-match-telemetry" "jaeger" "enabled" -}}
+http://{{ include "call-nested" (list . "open-match-telemetry.jaeger" "jaeger.collector.name") }}:14268/api/traces
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Call templates from sub-charts in a synthesized context, workaround for https://github.com/helm/helm/issues/3920
+Mainly useful for things like `{{ include "call-nested" (list . "redis" "redis.fullname") }}`
+https://github.com/helm/helm/issues/4535#issuecomment-416022809
+https://github.com/helm/helm/issues/4535#issuecomment-477778391
+*/}}
+{{- define "call-nested" }}
+{{- $dot := index . 0 }}
+{{- $subchart := index . 1 | splitList "." }}
+{{- $template := index . 2 }}
+{{- $values := $dot.Values }}
+{{- range $subchart }}
+{{- $values = index $values . }}
+{{- end }}
+{{- include $template (dict "Chart" (dict "Name" (last $subchart)) "Values" $values "Release" $dot.Release "Capabilities" $dot.Capabilities) }}
+{{- end }}
--- a/install/helm/open-match/templates/backend.yaml
+++ b/install/helm/open-match/templates/backend.yaml
@ -16,7 +16,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.backend.hostName }}
+  name: {{ include "openmatch.backend.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -44,19 +44,19 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ .Values.backend.hostName }}
+  name: {{ include "openmatch.backend.hostName" . }}
  namespace: {{ .Release.Namespace }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ .Values.backend.hostName }}
+    name: {{ include "openmatch.backend.hostName" . }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.backend.hostName }}
+  name: {{ include "openmatch.backend.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -82,12 +82,12 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
        {{- include "openmatch.volumes.withredis" . | nindent 8}}
-      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
+      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
      containers:
-      - name: {{ .Values.backend.hostName }}
+      - name: {{ include "openmatch.backend.hostName" . }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/frontend.yaml
+++ b/install/helm/open-match/templates/frontend.yaml
@ -16,7 +16,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.frontend.hostName }}
+  name: {{ include "openmatch.frontend.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -44,19 +44,19 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ .Values.frontend.hostName }}
+  name: {{ include "openmatch.frontend.hostName" . }}
  namespace: {{ .Release.Namespace }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ .Values.frontend.hostName }}
+    name: {{ include "openmatch.frontend.hostName" . }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.frontend.hostName }}
+  name: {{ include "openmatch.frontend.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -82,12 +82,12 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
        {{- include "openmatch.volumes.withredis" . | nindent 8}}
-      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
+      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
      containers:
-      - name: {{ .Values.frontend.hostName }}
+      - name: {{ include "openmatch.frontend.hostName" . }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/om-configmap-default.yaml
+++ b/install/helm/open-match/templates/om-configmap-default.yaml
@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: om-configmap-default
+  name: {{ include "openmatch.configmap.default" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -50,26 +50,33 @@ data:

    api:
      backend:
-        hostname: "{{ .Values.backend.hostName }}"
+        hostname: "{{ include "openmatch.backend.hostName" . }}"
        grpcport: "{{ .Values.backend.grpcPort }}"
        httpport: "{{ .Values.backend.httpPort }}"
      frontend:
-        hostname: "{{ .Values.frontend.hostName }}"
+        hostname: "{{ include "openmatch.frontend.hostName" . }}"
        grpcport: "{{ .Values.frontend.grpcPort }}"
        httpport: "{{ .Values.frontend.httpPort }}"
      query:
-        hostname: "{{ .Values.query.hostName }}"
+        hostname: "{{ include "openmatch.query.hostName" . }}"
        grpcport: "{{ .Values.query.grpcPort }}"
        httpport: "{{ .Values.query.httpPort }}"
      synchronizer:
-        hostname: "{{ .Values.synchronizer.hostName }}"
+        hostname: "{{ include "openmatch.synchronizer.hostName" . }}"
        grpcport: "{{ .Values.synchronizer.grpcPort }}"
        httpport: "{{ .Values.synchronizer.httpPort }}"
      swaggerui:
-        hostname: "{{ .Values.swaggerui.hostName }}"
+        hostname: "{{ include "openmatch.swaggerui.hostName" . }}"
        httpport: "{{ .Values.swaggerui.httpPort }}"
+
+      # Configurations for api.test and api.scale are used for testing.
+      test:
+        hostname: "{{ include "openmatch.fullname" . }}-test"
+        grpcport: "50509"
+        httpport: "51509"
      scale:
        httpport: "51509"
+
 {{- if .Values.global.tls.enabled }}
      tls:
        trustedCertificatePath: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
@ -78,21 +85,16 @@ data:
        rootcertificatefile: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
 {{- end }}

-    storage:
-      ignoreListTTL: {{ index .Values "open-match-core" "ignoreListTTL" }}
-      page:
-        size: 10000
-
    redis:
 {{- if index .Values "open-match-core" "redis" "enabled" }}
 {{- if index .Values "redis" "sentinel" "enabled"}}
      sentinelPort: {{ .Values.redis.sentinel.port }}
      sentinelMaster: {{ .Values.redis.sentinel.masterSet }}
-      sentinelHostname: {{ .Values.redis.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local
+      sentinelHostname: {{ include "call-nested" (list . "redis" "redis.fullname") }}
      sentinelUsePassword: {{ .Values.redis.sentinel.usePassword }}
 {{- else}}
      # Open Match's default Redis setups
-      hostname: {{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}.svc.cluster.local
+      hostname: {{ include "call-nested" (list . "redis" "redis.fullname") }}-master.{{ .Release.Namespace }}.svc.cluster.local
      port: {{ .Values.redis.redisPort }}
      user: {{ .Values.redis.user }}
 {{- end}}
@ -111,13 +113,14 @@ data:
        healthCheckTimeout: {{ index .Values "open-match-core" "redis" "pool" "healthCheckTimeout" }}

    telemetry:
+      reportingPeriod: "{{ .Values.global.telemetry.reportingPeriod }}"
+      traceSamplingFraction: "{{ .Values.global.telemetry.traceSamplingFraction }}"
      zpages:
        enable: "{{ .Values.global.telemetry.zpages.enabled }}"
      jaeger:
        enable: "{{ .Values.global.telemetry.jaeger.enabled }}"
-        samplerFraction: {{ .Values.global.telemetry.jaeger.samplerFraction }}
-        agentEndpoint: "{{ .Values.global.telemetry.jaeger.agentEndpoint }}"
-        collectorEndpoint: "{{ .Values.global.telemetry.jaeger.collectorEndpoint }}"
+        agentEndpoint: "{{ tpl .Values.global.telemetry.jaeger.agentEndpoint . }}"
+        collectorEndpoint: "{{ tpl .Values.global.telemetry.jaeger.collectorEndpoint . }}"
      prometheus:
        enable: "{{ .Values.global.telemetry.prometheus.enabled }}"
        endpoint: "{{ .Values.global.telemetry.prometheus.endpoint }}"
--- a/install/helm/open-match/templates/om-configmap-override.yaml
+++ b/install/helm/open-match/templates/om-configmap-override.yaml
@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: om-configmap-override
+  name: {{ include "openmatch.configmap.override" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -25,12 +25,24 @@ metadata:
    release: {{ .Release.Name }}
 data:
  matchmaker_config_override.yaml: |-
+    # Length of time between first fetch matches call, and when no further fetch
+    # matches calls will join the current evaluation/synchronization cycle, 
+    # instead waiting for the next cycle.
+    registrationInterval:  {{ index .Values "open-match-core" "registrationInterval" }}
+    # Length of time after match function as started before it will be canceled,
+    # and evaluator call input is EOF.
+    proposalCollectionInterval: {{ index .Values "open-match-core" "proposalCollectionInterval" }}
+    # Time after a ticket has been returned from fetch matches (marked as pending)
+    # before it automatically becomes active again and will be returned by query
+    # calls.
+    pendingReleaseTimeout: {{ index .Values "open-match-core" "pendingReleaseTimeout" }}
+    # Time after a ticket has been assigned before it is automatically delted.
+    assignedDeleteTimeout: {{ index .Values "open-match-core" "assignedDeleteTimeout" }}
+    # Maximum number of tickets to return on a single QueryTicketsResponse.
+    queryPageSize: {{ index .Values "open-match-core" "queryPageSize" }}
    api:
      evaluator:
-        hostname: "{{ .Values.evaluator.hostName }}"
+        hostname: "{{ include "openmatch.evaluator.hostName" . }}"
        grpcport: "{{ .Values.evaluator.grpcPort }}"
        httpport: "{{ .Values.evaluator.httpPort }}"
-    synchronizer:
-      registrationIntervalMs: 250ms
-      proposalCollectionIntervalMs: 20000ms
 {{- end }}
--- a/install/helm/open-match/templates/podsecuritypolicy.yaml
+++ b/install/helm/open-match/templates/podsecuritypolicy.yaml
@ -14,11 +14,11 @@

 {{- if index .Values "open-match-core" "enabled" }}
 {{- if empty .Values.ci }}
-# om-redis-podsecuritypolicy is the least restricted PSP used to create privileged pods to disable THP in host kernel.
+# This is the least restricted PSP used to create privileged pods to disable THP in host kernel.
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
-  name: om-redis-podsecuritypolicy
+  name: {{ include "openmatch.fullname" . }}-redis-podsecuritypolicy
  namespace: {{ .Release.Namespace }}
  annotations:
    {{- include "openmatch.chartmeta" . | nindent 4 }}
@ -51,11 +51,11 @@ spec:
  fsGroup:
    rule: 'RunAsAny'
 ---
-# om-core-podsecuritypolicy does not allow creating privileged pods and restrict binded pods to use the specified port ranges.
+# This does not allow creating privileged pods and restrict binded pods to use the specified port ranges.
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
-  name: om-core-podsecuritypolicy
+  name: {{ include "openmatch.fullname" . }}-core-podsecuritypolicy
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
--- a/install/helm/open-match/templates/query.yaml
+++ b/install/helm/open-match/templates/query.yaml
@ -16,7 +16,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.query.hostName }}
+  name: {{ include "openmatch.query.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -44,19 +44,19 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ .Values.query.hostName }}
+  name: {{ include "openmatch.query.hostName" . }}
  namespace: {{ .Release.Namespace }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ .Values.query.hostName }}
+    name: {{ include "openmatch.query.hostName" . }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.query.hostName }}
+  name: {{ include "openmatch.query.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -82,12 +82,12 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
        {{- include "openmatch.volumes.withredis" . | nindent 8 }}
-      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
+      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
      containers:
-      - name: {{ .Values.query.hostName }}
+      - name: {{ include "openmatch.query.hostName" . }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/service-account.yaml
+++ b/install/helm/open-match/templates/service-account.yaml
@ -29,7 +29,7 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.global.kubernetes.serviceAccount }}
+  name: {{ include "openmatch.serviceAccount.name" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -40,28 +40,26 @@ automountServiceAccountToken: true
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: om-service-role
+  name: {{ include "openmatch.fullname" . }}-service-role
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    release: {{ .Release.Name }}
 rules:
-# Define om-service-role to use om-core-podsecuritypolicy
 - apiGroups:
  - extensions
  resources:
  - podsecuritypolicies
  resourceNames:
-  - om-core-podsecuritypolicy
+  - {{ include "openmatch.fullname" . }}-core-podsecuritypolicy
  verbs:
  - use
 ---
-# This applies om-service-role to the open-match unprivileged service account under the release namespace. 
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: om-service-role-binding
+  name: {{ include "openmatch.fullname" . }}-service-role-binding
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -73,34 +71,32 @@ subjects:
  apiGroup: rbac.authorization.k8s.io
 roleRef:
  kind: Role
-  name: om-service-role
+  name: {{ include "openmatch.fullname" . }}-service-role
  apiGroup: rbac.authorization.k8s.io
 ---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: om-redis-role
+  name: {{ include "openmatch.fullname" . }}-redis-role
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    release: {{ .Release.Name }}
 rules:
-# Define om-redis-role to use om-redis-podsecuritypolicy
 - apiGroups:
  - extensions
  resources:
  - podsecuritypolicies
  resourceNames:
-  - om-redis-podsecuritypolicy
+  - {{ include "openmatch.fullname" . }}-redis-podsecuritypolicy
  verbs:
  - use
 ---
-# This applies om-redis role to the om-redis privileged service account under the release namespace.
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: om-redis-role-binding
+  name: {{ include "openmatch.fullname" . }}-redis-role-binding
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -108,10 +104,10 @@ metadata:
    release: {{ .Release.Name }}
 subjects:
 - kind: ServiceAccount
-  name: {{ .Values.redis.serviceAccount.name }} # Redis service account
+  name: {{ include "call-nested" (list . "redis" "redis.serviceAccountName") }}
  namespace: {{ .Release.Namespace }}
 roleRef:
  kind: Role
-  name: om-redis-role
+  name: {{ include "openmatch.fullname" . }}-redis-role
  apiGroup: rbac.authorization.k8s.io
 {{- end }}
--- a/install/helm/open-match/templates/swaggerui.yaml
+++ b/install/helm/open-match/templates/swaggerui.yaml
@ -16,7 +16,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.swaggerui.hostName }}
+  name: {{ include "openmatch.swaggerui.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -36,7 +36,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.swaggerui.hostName }}
+  name: {{ include "openmatch.swaggerui.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -61,11 +61,11 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
+      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
      containers:
-      - name: {{ .Values.swaggerui.hostName }}
+      - name: {{ include "openmatch.swaggerui.hostName" . }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/synchronizer.yaml
+++ b/install/helm/open-match/templates/synchronizer.yaml
@ -16,7 +16,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ .Values.synchronizer.hostName }}
+  name: {{ include "openmatch.synchronizer.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -40,7 +40,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.synchronizer.hostName }}
+  name: {{ include "openmatch.synchronizer.hostName" . }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -66,12 +66,12 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
        {{- include "openmatch.volumes.withredis" . | nindent 8 }}
-      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
+      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
      containers:
-      - name: {{ .Values.synchronizer.hostName }}
+      - name: {{ include "openmatch.synchronizer.hostName" . }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/tests/om-test-role-binding.yaml
+++ b/install/helm/open-match/templates/tests/om-test-role-binding.yaml
@ -1,8 +1,23 @@
-# This applies om-test-role to the open-match-test-service account under the release namespace. 
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- if .Values.ci }}
+
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: om-test-role-binding
+  name: {{ include "openmatch.fullname" . }}-test-role-binding
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -10,9 +25,11 @@ metadata:
    release: {{ .Release.Name }}
 subjects:
 - kind: ServiceAccount
-  name: open-match-test-service
+  name: {{ include "openmatch.fullname" . }}-test-service
  namespace: {{ .Release.Namespace }}
 roleRef:
  kind: Role
-  name: om-test-role
+  name: {{ include "openmatch.fullname" . }}-test-role
  apiGroup: rbac.authorization.k8s.io
+
+{{- end }}
--- a/install/helm/open-match/templates/tests/om-test-role.yaml
+++ b/install/helm/open-match/templates/tests/om-test-role.yaml
@ -1,23 +1,38 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- if .Values.ci }}
+
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: om-test-role
+  name: {{ include "openmatch.fullname" . }}-test-role
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    release: {{ .Release.Name }}
 rules:
-# Define om-test-role to use om-core-podsecuritypolicy
 - apiGroups:
  - extensions
  resources:
  - podsecuritypolicies
  resourceNames:
-  - om-core-podsecuritypolicy
+  - {{ include "openmatch.fullname" . }}-core-podsecuritypolicy
  verbs:
  - use
-# Grant om-test-role get & list permission for k8s endpoints and pods resources
+# Grant this role get & list permission for k8s endpoints and pods resources
 # Required for e2e in-cluster testing.
 - apiGroups:
  - ""
@ -27,3 +42,5 @@ rules:
  verbs:
  - get
  - list
+
+{{- end }}
--- a/install/helm/open-match/templates/tests/om-test-service-account.yaml
+++ b/install/helm/open-match/templates/tests/om-test-service-account.yaml
@ -1,11 +1,29 @@
-# Create a service account for open-match-test services.
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- if .Values.ci }}
+
+# Create a service account for test services.
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: open-match-test-service
+  name: {{ include "openmatch.fullname" . }}-test-service
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    release: {{ .Release.Name }}
 automountServiceAccountToken: true
+
+{{- end }}
--- a/install/helm/open-match/templates/tests/om-test.yaml
+++ b/install/helm/open-match/templates/tests/om-test.yaml
@ -1,24 +1,83 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- if .Values.ci }}
+
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ include "openmatch.fullname" . }}-test
+  namespace: {{ .Release.Namespace }}
+  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
+  labels:
+    app: {{ template "openmatch.name" . }}
+    component: test
+    release: {{ .Release.Name }}
+spec:
+  selector:
+    app: {{ template "openmatch.name" . }}
+    component: test
+    release: {{ .Release.Name }}
+  ports:
+  - name: grpc
+    protocol: TCP
+    port: 50509
+  - name: http
+    protocol: TCP
+    port: 51509
+---
 apiVersion: v1
 kind: Pod
 metadata:
-  name: om-test
+  name: {{ include "openmatch.fullname" . }}-test
  namespace: {{ .Release.Namespace }}
  annotations: 
    {{- include "openmatch.chartmeta" . | nindent 4 }}
    "helm.sh/hook": test-success
  labels:
    app: {{ template "openmatch.name" . }}
-    component: om-test
+    component: test
    release: {{ .Release.Name }}
 spec:
  # Specifies the duration in seconds relative to the startTime that the job may be active before the system tries to terminate it.
  activeDeadlineSeconds: 900
-  serviceAccountName: open-match-test-service
+  serviceAccountName: {{ include "openmatch.fullname" . }}-test-service
  automountServiceAccountToken: true
+  volumes:
+  - configMap:
+      defaultMode: 420
+      name: {{ include "openmatch.configmap.default" . }}
+    name: om-config-volume-default
+  - configMap:
+      defaultMode: 420
+      name: {{ include "openmatch.configmap.override" . }}
+    name: om-config-volume-override
  containers:
-  - image: "{{ .Values.global.image.registry }}/openmatch-base-build:{{ .Values.global.image.tag }}"
+  - name: {{ include "openmatch.fullname" . }}-test
+    volumeMounts:
+    - mountPath: /app/config/default
+      name: om-config-volume-default
+    - mountPath: /app/config/override
+      name: om-config-volume-override
+    image: "{{ .Values.global.image.registry }}/openmatch-base-build:{{ .Values.global.image.tag }}"
+    ports:
+    - name: grpc
+      containerPort: 50509
+    - name: http
+      containerPort: 51509
    imagePullPolicy: Always
-    name: om-test
+    name: test
    resources:
      limits:
        memory: 800Mi
@ -32,7 +91,7 @@ spec:
    command: ["go"]
    args:
    - "test"
-    - "./test/e2e"
+    - "./internal/testing/e2e"
    - "-v"
    - "-timeout"
    - "150s"
@ -40,3 +99,5 @@ spec:
    - "-tags"
    - "e2ecluster"
  restartPolicy: Never
+
+{{- end }}
--- a/install/helm/open-match/templates/tls-secret.yaml
+++ b/install/helm/open-match/templates/tls-secret.yaml
@ -17,7 +17,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: om-tls-rootca
+  name: {{ include "openmatch.fullname" . }}-tls-rootca
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -31,9 +31,9 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: om-tls-server
+  name: {{ include "openmatch.fullname" . }}-tls-server
  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 2 }}
+  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    component: tls
--- a/install/helm/open-match/values-production.yaml
+++ b/install/helm/open-match/values-production.yaml
@ -23,7 +23,7 @@
 # Begins the configuration section for `query` component in Open Match.
 # query:
 #
-#   # Specifies om-query as the in-cluster domain name for the `query` service.
+#   # Override the default in-cluster domain name for the `query` service to om-query.
 #   hostName: om-query
 #
 #   # Specifies the port for receiving RESTful HTTP requests in the `query` service.
@ -44,67 +44,68 @@
 #   # Specifies the image name to be used in a Kubernetes pod for `query` compoenent.
 #   image: openmatch-query
 swaggerui: &swaggerui
-  hostName: om-swaggerui
+  hostName:
  httpPort: 51500
  portType: ClusterIP
  replicas: 1
  image: openmatch-swaggerui
 query: &query
-  hostName: om-query
+  hostName:
  grpcPort: 50503
  httpPort: 51503
  portType: ClusterIP
  replicas: 3
  image: openmatch-query
 frontend: &frontend
-  hostName: om-frontend
+  hostName:
  grpcPort: 50504
  httpPort: 51504
  portType: ClusterIP
  replicas: 3
  image: openmatch-frontend
 backend: &backend
-  hostName: om-backend
+  hostName:
  grpcPort: 50505
  httpPort: 51505
  portType: ClusterIP
  replicas: 3
  image: openmatch-backend
 synchronizer: &synchronizer
-  hostName: om-synchronizer
+  hostName:
  grpcPort: 50506
  httpPort: 51506
  portType: ClusterIP
  replicas: 1
  image: openmatch-synchronizer
 evaluator: &evaluator
-  hostName: om-evaluator
+  hostName:
  grpcPort: 50508
  httpPort: 51508
  replicas: 3
 function: &function
-  hostName: om-function
+  hostName:
  grpcPort: 50502
  httpPort: 51502
  replicas: 3

 # Specifies the location and name of the Open Match application-level config volumes.
-  # Used in template: `openmatch.volumemounts.configs` and `openmatch.volumes.configs` under `templates/_helpers.tpl` file.
+# Used in template: `openmatch.volumemounts.configs` and `openmatch.volumes.configs` under `templates/_helpers.tpl` file.
 configs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    configName: om-configmap-default
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.default" . }}'
  override:
    volumeName: om-config-volume-override
    mountPath: /app/config/override
-    configName: om-configmap-override
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.override" . }}'

 # Override Redis settings
 # https://hub.helm.sh/charts/stable/redis
 # https://github.com/helm/charts/tree/master/stable/redis
 redis:
-  fullnameOverride: om-redis
  redisPort: 6379
  usePassword: false
  usePasswordFile: false
@ -133,7 +134,6 @@ redis:
    slaveCount: 3
  serviceAccount:
    create: true
-    name: open-match-redis-service
  slave:
    persistence:
      enabled: false
@ -172,14 +172,30 @@ redis:
 # Controls if users need to install backend, frontend, query, om-configmap, and swaggerui.
 open-match-core:
  enabled: true
-  ignoreListTTL: 60000ms
+
+  # Length of time between first fetch matches call, and when no further fetch
+  # matches calls will join the current evaluation/synchronization cycle,
+  # instead waiting for the next cycle.
+  registrationInterval: 250ms
+  # Length of time after match function as started before it will be canceled,
+  # and evaluator call input is EOF.
+  proposalCollectionInterval: 20s
+  # Time after a ticket has been returned from fetch matches (marked as pending)
+  # before it automatically becomes active again and will be returned by query
+  # calls.
+  pendingReleaseTimeout: 1m
+  # Time after a ticket has been assigned before it is automatically delted.
+  assignedDeleteTimeout: 10m
+  # Maximum number of tickets to return on a single QueryTicketsResponse.
+  queryPageSize: 10000
+
  redis:
    enabled: true
    # If open-match-core.redis.enabled is set to false, have Open Match components talk to this redis address instead.
    # Otherwise the default is set to the om-redis instance.
    hostname: # Your redis server address
    port: 6379
-    user: 
+    user:
    pool:
      maxIdle: 500
      maxActive: 500
@ -192,8 +208,6 @@ open-match-core:
 open-match-scale:
  # Switch the value between true/false to turn on/off this subchart
  enabled: false
-  frontend: *frontend
-  backend: *backend

 # Controls if users need to install the monitoring tools in Open Match.
 open-match-telemetry:
@ -206,7 +220,6 @@ open-match-customize:
  enabled: false
  evaluator: *evaluator
  function: *function
-  query: *query
  # You can override the evaluator/mmf image
  # evaluator:
  #   image: [YOUR_EVALUATOR_IMAGE]
@ -233,8 +246,8 @@ global:
      limits:
        memory: 3Gi
        cpu: 2
-    # Defines a service account which provides an identity for processes that run in a Pod in Open Match.
-    serviceAccount: open-match-unprivileged-service
+    # Overrides the name of the service account which provides an identity for processes that run in a Pod in Open Match.
+    serviceAccount:
    # Use this field if you need to override the port type for all services defined in this chart
    service:
      portType:
@ -259,18 +272,18 @@ global:
    tag: 0.0.0-dev
    pullPolicy: Always

-
  # Expose the telemetry configurations to all subcharts because prometheus, for example,
  # requires pod-level annotation to customize its scrape path.
  # See definitions in templates/_helpers.tpl - "prometheus.annotations" section for details
  telemetry:
+    reportingPeriod: "1m"
+    traceSamplingFraction: 0.005 # What fraction of traces to sample.
    zpages:
      enabled: true
    jaeger:
      enabled: false
-      samplerFraction: 0.005 # Configures a sampler that samples a given fraction of traces.
-      agentEndpoint: "open-match-jaeger-agent:6831"
-      collectorEndpoint: "http://open-match-jaeger-collector:14268/api/traces"
+      agentEndpoint: '{{ include "openmatch.jaeger.agent" . }}'
+      collectorEndpoint: '{{ include "openmatch.jaeger.collector" . }}'
    prometheus:
      enabled: false
      endpoint: "/metrics"
@ -280,4 +293,3 @@ global:
      prefix: "open_match"
    grafana:
      enabled: false
-    reportingPeriod: "1m"
--- a/install/helm/open-match/values.yaml
+++ b/install/helm/open-match/values.yaml
@ -23,7 +23,7 @@
 # Begins the configuration section for `query` component in Open Match.
 # query:
 #
-#   # Specifies om-query as the in-cluster domain name for the `query` service.
+#   # Override the default in-cluster domain name for the `query` service to om-query.
 #   hostName: om-query
 #
 #   # Specifies the port for receiving RESTful HTTP requests in the `query` service.
@ -44,46 +44,46 @@
 #   # Specifies the image name to be used in a Kubernetes pod for `query` compoenent.
 #   image: openmatch-query
 swaggerui: &swaggerui
-  hostName: om-swaggerui
+  hostName:
  httpPort: 51500
  portType: ClusterIP
  replicas: 1
  image: openmatch-swaggerui
 query: &query
-  hostName: om-query
+  hostName:
  grpcPort: 50503
  httpPort: 51503
  portType: ClusterIP
  replicas: 3
  image: openmatch-query
 frontend: &frontend
-  hostName: om-frontend
+  hostName:
  grpcPort: 50504
  httpPort: 51504
  portType: ClusterIP
  replicas: 3
  image: openmatch-frontend
 backend: &backend
-  hostName: om-backend
+  hostName:
  grpcPort: 50505
  httpPort: 51505
  portType: ClusterIP
  replicas: 3
  image: openmatch-backend
 synchronizer: &synchronizer
-  hostName: om-synchronizer
+  hostName:
  grpcPort: 50506
  httpPort: 51506
  portType: ClusterIP
  replicas: 1
  image: openmatch-synchronizer
 evaluator: &evaluator
-  hostName: om-evaluator
+  hostName:
  grpcPort: 50508
  httpPort: 51508
  replicas: 3
 function: &function
-  hostName: om-function
+  hostName:
  grpcPort: 50502
  httpPort: 51502
  replicas: 3
@ -94,17 +94,18 @@ configs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    configName: om-configmap-default
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.default" . }}'
  override:
    volumeName: om-config-volume-override
    mountPath: /app/config/override
-    configName: om-configmap-override
+    # This will be parsed through the `tpl` function.
+    configName: '{{ include "openmatch.configmap.override" . }}'

 # Override Redis settings
 # https://hub.helm.sh/charts/stable/redis
 # https://github.com/helm/charts/tree/master/stable/redis
 redis:
-  fullnameOverride: om-redis
  redisPort: 6379
  usePassword: false
  usePasswordFile: false
@ -128,7 +129,6 @@ redis:
    slaveCount: 2
  serviceAccount:
    create: true
-    name: open-match-redis-service
  sysctlImage:
    # Enable this setting in production if you are running Open Match under Linux environment
    enabled: false
@ -157,14 +157,30 @@ redis:
 # Controls if users need to install backend, frontend, query, om-configmap, and swaggerui.
 open-match-core:
  enabled: true
-  ignoreListTTL: 60000ms
+
+  # Length of time between first fetch matches call, and when no further fetch
+  # matches calls will join the current evaluation/synchronization cycle,
+  # instead waiting for the next cycle.
+  registrationInterval: 250ms
+  # Length of time after match function as started before it will be canceled,
+  # and evaluator call input is EOF.
+  proposalCollectionInterval: 20s
+  # Time after a ticket has been returned from fetch matches (marked as pending)
+  # before it automatically becomes active again and will be returned by query
+  # calls.
+  pendingReleaseTimeout: 1m
+  # Time after a ticket has been assigned before it is automatically delted.
+  assignedDeleteTimeout: 10m
+  # Maximum number of tickets to return on a single QueryTicketsResponse.
+  queryPageSize: 10000
+
  redis:
    enabled: true
    # If open-match-core.redis.enabled is set to false, have Open Match components talk to this redis address instead.
    # Otherwise the default is set to the om-redis instance.
    hostname: # Your redis server address
    port: 6379
-    user: 
+    user:
    pool:
      maxIdle: 200
      maxActive: 0
@ -177,8 +193,6 @@ open-match-core:
 open-match-scale:
  # Switch the value between true/false to turn on/off this subchart
  enabled: false
-  frontend: *frontend
-  backend: *backend

 # Controls if users need to install the monitoring tools in Open Match.
 open-match-telemetry:
@ -191,7 +205,6 @@ open-match-customize:
  enabled: false
  evaluator: *evaluator
  function: *function
-  query: *query
  # You can override the evaluator/mmf image
  # evaluator:
  #   image: [YOUR_EVALUATOR_IMAGE]
@ -218,8 +231,8 @@ global:
      limits:
        memory: 100Mi
        cpu: 100m
-    # Defines a service account which provides an identity for processes that run in a Pod in Open Match.
-    serviceAccount: open-match-unprivileged-service
+    # Overrides the name of the service account which provides an identity for processes that run in a Pod in Open Match.
+    serviceAccount:
    # Use this field if you need to override the port type for all services defined in this chart
    service:
      portType:
@ -241,21 +254,21 @@ global:
  # Use this field if you need to override the image registry and image tag for all services defined in this chart
  image:
    registry: gcr.io/open-match-public-images
-    tag: 0.0.0-dev
+    tag: 1.1.0-rc.1
    pullPolicy: Always

-
  # Expose the telemetry configurations to all subcharts because prometheus, for example,
  # requires pod-level annotation to customize its scrape path.
  # See definitions in templates/_helpers.tpl - "prometheus.annotations" section for details
  telemetry:
+    reportingPeriod: "1m"
+    traceSamplingFraction: 0.01 # What fraction of traces to sample.
    zpages:
      enabled: true
    jaeger:
      enabled: false
-      samplerFraction: 0.01 # Configures a sampler that samples a given fraction of traces.
-      agentEndpoint: "open-match-jaeger-agent:6831"
-      collectorEndpoint: "http://open-match-jaeger-collector:14268/api/traces"
+      agentEndpoint: '{{ include "openmatch.jaeger.agent" . }}'
+      collectorEndpoint: '{{ include "openmatch.jaeger.collector" . }}'
    prometheus:
      enabled: false
      endpoint: "/metrics"
@ -265,4 +278,5 @@ global:
      prefix: "open_match"
    grafana:
      enabled: false
-    reportingPeriod: "1m"
+      # This will be called with `tpl` in the open-match-telemetry subchart namespace.
+      prometheusServer: 'http://{{ include "call-nested" (list . "prometheus" "prometheus.server.fullname") }}.{{ .Release.Namespace }}.svc.cluster.local:80/'
--- a/internal/app/appmain.go
+++ b/internal/app/appmain.go
@ -1,55 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package app contains the common application initialization code for Open Match servers.
-package app
-
-import (
-	"github.com/sirupsen/logrus"
-	"open-match.dev/open-match/internal/config"
-	"open-match.dev/open-match/internal/logging"
-	"open-match.dev/open-match/internal/rpc"
-)
-
-var (
-	logger = logrus.WithFields(logrus.Fields{
-		"app":       "openmatch",
-		"component": "app.main",
-	})
-)
-
-// RunApplication creates a server.
-func RunApplication(serverName string, getCfg func() (config.View, error), bindService func(*rpc.ServerParams, config.View) error) {
-	cfg, err := getCfg()
-	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error": err.Error(),
-		}).Fatalf("cannot read configuration.")
-	}
-	logging.ConfigureLogging(cfg)
-	p, err := rpc.NewServerParamsFromConfig(cfg, "api."+serverName)
-	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error": err.Error(),
-		}).Fatalf("cannot construct server.")
-	}
-
-	if err := bindService(p, cfg); err != nil {
-		logger.WithFields(logrus.Fields{
-			"error": err.Error(),
-		}).Fatalf("failed to bind %s service.", serverName)
-	}
-
-	rpc.MustServeForever(p)
-}
--- a/internal/app/backend/backend.go
+++ b/internal/app/backend/backend.go
@ -15,25 +15,81 @@
 package backend

 import (
+	"go.opencensus.io/stats"
+	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc"
-	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/appmain"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/statestore"
+	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

-// BindService creates the backend service and binds it to the serving harness.
-func BindService(p *rpc.ServerParams, cfg config.View) error {
-	service := &backendService{
-		synchronizer: newSynchronizerClient(cfg),
-		store:        statestore.New(cfg),
-		cc:           rpc.NewClientCache(cfg),
+var (
+	totalBytesPerMatch      = stats.Int64("open-match.dev/backend/total_bytes_per_match", "Total bytes per match", stats.UnitBytes)
+	ticketsPerMatch         = stats.Int64("open-match.dev/backend/tickets_per_match", "Number of tickets per match", stats.UnitDimensionless)
+	ticketsReleased         = stats.Int64("open-match.dev/backend/tickets_released", "Number of tickets released per request", stats.UnitDimensionless)
+	ticketsAssigned         = stats.Int64("open-match.dev/backend/tickets_assigned", "Number of tickets assigned per request", stats.UnitDimensionless)
+	ticketsTimeToAssignment = stats.Int64("open-match.dev/backend/ticket_time_to_assignment", "Time to assignment for tickets", stats.UnitMilliseconds)
+
+	totalMatchesView = &view.View{
+		Measure:     totalBytesPerMatch,
+		Name:        "open-match.dev/backend/total_matches",
+		Description: "Total number of matches",
+		Aggregation: view.Count(),
+	}
+	totalBytesPerMatchView = &view.View{
+		Measure:     totalBytesPerMatch,
+		Name:        "open-match.dev/backend/total_bytes_per_match",
+		Description: "Total bytes per match",
+		Aggregation: telemetry.DefaultBytesDistribution,
+	}
+	ticketsPerMatchView = &view.View{
+		Measure:     ticketsPerMatch,
+		Name:        "open-match.dev/backend/tickets_per_match",
+		Description: "Tickets per ticket",
+		Aggregation: telemetry.DefaultCountDistribution,
+	}
+	ticketsAssignedView = &view.View{
+		Measure:     ticketsAssigned,
+		Name:        "open-match.dev/backend/tickets_assigned",
+		Description: "Number of tickets assigned per request",
+		Aggregation: view.Sum(),
+	}
+	ticketsReleasedView = &view.View{
+		Measure:     ticketsReleased,
+		Name:        "open-match.dev/backend/tickets_released",
+		Description: "Number of tickets released per request",
+		Aggregation: view.Sum(),
 	}

-	p.AddHealthCheckFunc(service.store.HealthCheck)
-	p.AddHandleFunc(func(s *grpc.Server) {
+	ticketsTimeToAssignmentView = &view.View{
+		Measure:     ticketsTimeToAssignment,
+		Name:        "open-match.dev/backend/ticket_time_to_assignment",
+		Description: "Time to assignment for tickets",
+		Aggregation: telemetry.DefaultMillisecondsDistribution,
+	}
+)
+
+// BindService creates the backend service and binds it to the serving harness.
+func BindService(p *appmain.Params, b *appmain.Bindings) error {
+	service := &backendService{
+		synchronizer: newSynchronizerClient(p.Config()),
+		store:        statestore.New(p.Config()),
+		cc:           rpc.NewClientCache(p.Config()),
+	}
+
+	b.AddHealthCheckFunc(service.store.HealthCheck)
+	b.AddHandleFunc(func(s *grpc.Server) {
 		pb.RegisterBackendServiceServer(s, service)
 	}, pb.RegisterBackendServiceHandlerFromEndpoint)
-
+	b.RegisterViews(
+		totalMatchesView,
+		totalBytesPerMatchView,
+		ticketsPerMatchView,
+		ticketsAssignedView,
+		ticketsReleasedView,
+		ticketsTimeToAssignmentView,
+	)
 	return nil
 }
--- a/internal/app/backend/backend_service.go
+++ b/internal/app/backend/backend_service.go
@ -22,17 +22,23 @@ import (
 	"net/http"
 	"strings"
 	"sync"
+	"time"
+
+	"go.opencensus.io/stats"

 	"github.com/golang/protobuf/jsonpb"
+	"github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/ptypes"
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"open-match.dev/open-match/internal/appmain/contextcause"
 	"open-match.dev/open-match/internal/ipb"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/statestore"
-	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

@ -49,10 +55,6 @@ var (
 		"app":       "openmatch",
 		"component": "app.backend",
 	})
-	mMatchesFetched          = telemetry.Counter("backend/matches_fetched", "matches fetched")
-	mMatchesSentToEvaluation = telemetry.Counter("backend/matches_sent_to_evaluation", "matches sent to evaluation")
-	mTicketsAssigned         = telemetry.Counter("backend/tickets_assigned", "tickets assigned")
-	mTicketsReleased         = telemetry.Counter("backend/tickets_released", "tickets released")
 )

 // FetchMatches triggers a MatchFunction with the specified MatchProfiles, while each MatchProfile
@ -60,10 +62,10 @@ var (
 // FetchMatches immediately returns an error if it encounters any execution failures.
 //   - If the synchronizer is enabled, FetchMatch will then call the synchronizer to deduplicate proposals with overlapped tickets.
 func (s *backendService) FetchMatches(req *pb.FetchMatchesRequest, stream pb.BackendService_FetchMatchesServer) error {
-	if req.GetConfig() == nil {
+	if req.Config == nil {
 		return status.Error(codes.InvalidArgument, ".config is required")
 	}
-	if req.GetProfile() == nil {
+	if req.Profile == nil {
 		return status.Error(codes.InvalidArgument, ".profile is required")
 	}

@ -77,7 +79,7 @@ func (s *backendService) FetchMatches(req *pb.FetchMatchesRequest, stream pb.Bac
 	// The mmf must be canceled if the synchronizer call fails (which will
 	// cancel the context from the error group).  However the synchronizer call
 	// is NOT dependant on the mmf call.
-	mmfCtx, cancelMmfs := context.WithCancel(ctx)
+	mmfCtx, cancelMmfs := contextcause.WithCancelCause(ctx)
 	// Closed when mmfs should start.
 	startMmfs := make(chan struct{})
 	proposals := make(chan *pb.Match)
@ -102,13 +104,8 @@ func (s *backendService) FetchMatches(req *pb.FetchMatchesRequest, stream pb.Bac

 	// TODO: Send mmf error in FetchSummary instead of erroring call.
 	if syncErr != nil || mmfErr != nil {
-		logger.WithFields(logrus.Fields{
-			"syncErr": syncErr,
-			"mmfErr":  mmfErr,
-		}).Error("error(s) in FetchMatches call.")
-
 		return fmt.Errorf(
-			"error(s) in FetchMatches call. syncErr=[%s], mmfErr=[%s]",
+			"error(s) in FetchMatches call. syncErr=[%v], mmfErr=[%v]",
 			syncErr,
 			mmfErr,
 		)
@ -127,11 +124,10 @@ sendProposals:
 			if !ok {
 				break sendProposals
 			}
-			id, loaded := m.LoadOrStore(p.GetMatchId(), p)
+			_, loaded := m.LoadOrStore(p.GetMatchId(), p)
 			if loaded {
-				return fmt.Errorf("found duplicate matchID %s returned from MMF", id)
+				return fmt.Errorf("MatchMakingFunction returned same match_id twice: \"%s\"", p.GetMatchId())
 			}
-			telemetry.RecordUnitMeasurement(ctx, mMatchesSentToEvaluation)
 			err := syncStream.Send(&ipb.SynchronizeRequest{Proposal: p})
 			if err != nil {
 				return fmt.Errorf("error sending proposal to synchronizer: %w", err)
@ -146,7 +142,7 @@ sendProposals:
 	return nil
 }

-func synchronizeRecv(ctx context.Context, syncStream synchronizerStream, m *sync.Map, stream pb.BackendService_FetchMatchesServer, startMmfs chan<- struct{}, cancelMmfs context.CancelFunc) error {
+func synchronizeRecv(ctx context.Context, syncStream synchronizerStream, m *sync.Map, stream pb.BackendService_FetchMatchesServer, startMmfs chan<- struct{}, cancelMmfs contextcause.CancelErrFunc) error {
 	var startMmfsOnce sync.Once

 	for {
@ -165,12 +161,17 @@ func synchronizeRecv(ctx context.Context, syncStream synchronizerStream, m *sync
 		}

 		if resp.CancelMmfs {
-			cancelMmfs()
+			cancelMmfs(errors.New("match function ran longer than proposal window, canceling"))
 		}

-		if match, ok := m.Load(resp.GetMatchId()); ok {
-			telemetry.RecordUnitMeasurement(ctx, mMatchesFetched)
-			err = stream.Send(&pb.FetchMatchesResponse{Match: match.(*pb.Match)})
+		if v, ok := m.Load(resp.GetMatchId()); ok {
+			match, ok := v.(*pb.Match)
+			if !ok {
+				return fmt.Errorf("error casting sync map value into *pb.Match: %w", err)
+			}
+			stats.Record(ctx, totalBytesPerMatch.M(int64(proto.Size(match))))
+			stats.Record(ctx, ticketsPerMatch.M(int64(len(match.GetTickets()))))
+			err = stream.Send(&pb.FetchMatchesResponse{Match: match})
 			if err != nil {
 				return fmt.Errorf("error sending match to caller of backend: %w", err)
 			}
@ -197,17 +198,17 @@ func callGrpcMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf
 	var conn *grpc.ClientConn
 	conn, err := cc.GetGRPC(address)
 	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error":    err.Error(),
-			"function": address,
-		}).Error("failed to establish grpc client connection to match function")
-		return status.Error(codes.InvalidArgument, "failed to connect to match function")
+		return status.Error(codes.InvalidArgument, "failed to establish grpc client connection to match function")
 	}
 	client := pb.NewMatchFunctionClient(conn)

 	stream, err := client.Run(ctx, &pb.RunRequest{Profile: profile})
 	if err != nil {
-		logger.WithError(err).Error("failed to run match function for profile")
+		err = errors.Wrap(err, "failed to run match function for profile")
+		if ctx.Err() != nil {
+			// gRPC likes to suppress the context's error, so stop that.
+			return ctx.Err()
+		}
 		return err
 	}

@ -217,7 +218,11 @@ func callGrpcMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf
 			break
 		}
 		if err != nil {
-			logger.Errorf("%v.Run() error, %v\n", client, err)
+			err = errors.Wrapf(err, "%v.Run() error, %v", client, err)
+			if ctx.Err() != nil {
+				// gRPC likes to suppress the context's error, so stop that.
+				return ctx.Err()
+			}
 			return err
 		}
 		select {
@ -233,11 +238,8 @@ func callGrpcMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf
 func callHTTPMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProfile, address string, proposals chan<- *pb.Match) error {
 	client, baseURL, err := cc.GetHTTP(address)
 	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error":    err.Error(),
-			"function": address,
-		}).Error("failed to establish rest client connection to match function")
-		return status.Error(codes.InvalidArgument, "failed to connect to match function")
+		err = errors.Wrapf(err, "failed to establish rest client connection to match function: %s", address)
+		return status.Error(codes.InvalidArgument, err.Error())
 	}

 	var m jsonpb.Marshaler
@ -253,7 +255,7 @@ func callHTTPMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf

 	resp, err := client.Do(req.WithContext(ctx))
 	if err != nil {
-		return status.Errorf(codes.Internal, "failed to get response from mmf run for proile %s: %s", profile.Name, err.Error())
+		return status.Errorf(codes.Internal, "failed to get response from mmf run for profile %s: %s", profile.Name, err.Error())
 	}
 	defer func() {
 		err = resp.Body.Close()
@ -294,21 +296,28 @@ func callHTTPMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf
 }

 func (s *backendService) ReleaseTickets(ctx context.Context, req *pb.ReleaseTicketsRequest) (*pb.ReleaseTicketsResponse, error) {
-	err := doReleasetickets(ctx, req, s.store)
+	err := s.store.DeleteTicketsFromPendingRelease(ctx, req.GetTicketIds())
 	if err != nil {
-		logger.WithError(err).Error("failed to remove the awaiting tickets from the ignore list for requested tickets")
+		err = errors.Wrap(err, "failed to remove the awaiting tickets from the pending release for requested tickets")
 		return nil, err
 	}

-	telemetry.RecordNUnitMeasurement(ctx, mTicketsReleased, int64(len(req.TicketIds)))
+	stats.Record(ctx, ticketsReleased.M(int64(len(req.TicketIds))))
 	return &pb.ReleaseTicketsResponse{}, nil
 }

+func (s *backendService) ReleaseAllTickets(ctx context.Context, req *pb.ReleaseAllTicketsRequest) (*pb.ReleaseAllTicketsResponse, error) {
+	err := s.store.ReleaseAllTickets(ctx)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.ReleaseAllTicketsResponse{}, nil
+}
+
 // AssignTickets overwrites the Assignment field of the input TicketIds.
 func (s *backendService) AssignTickets(ctx context.Context, req *pb.AssignTicketsRequest) (*pb.AssignTicketsResponse, error) {
 	resp, err := doAssignTickets(ctx, req, s.store)
 	if err != nil {
-		logger.WithError(err).Error("failed to update assignments for requested tickets")
 		return nil, err
 	}

@ -317,17 +326,23 @@ func (s *backendService) AssignTickets(ctx context.Context, req *pb.AssignTicket
 		numIds += len(ag.TicketIds)
 	}

-	telemetry.RecordNUnitMeasurement(ctx, mTicketsAssigned, int64(numIds))
+	stats.Record(ctx, ticketsAssigned.M(int64(numIds)))
 	return resp, nil
 }

 func doAssignTickets(ctx context.Context, req *pb.AssignTicketsRequest, store statestore.Service) (*pb.AssignTicketsResponse, error) {
-	resp, err := store.UpdateAssignments(ctx, req)
+	resp, tickets, err := store.UpdateAssignments(ctx, req)
 	if err != nil {
-		logger.WithError(err).Error("failed to update assignments")
 		return nil, err
 	}

+	for _, ticket := range tickets {
+		err = recordTimeToAssignment(ctx, ticket)
+		if err != nil {
+			logger.WithError(err).Errorf("failed to record time to assignment for ticket %s", ticket.Id)
+		}
+	}
+
 	ids := []string{}

 	for _, ag := range req.Assignments {
@ -343,7 +358,7 @@ func doAssignTickets(ctx context.Context, req *pb.AssignTicketsRequest, store st
 		}
 	}

-	if err = store.DeleteTicketsFromIgnoreList(ctx, ids); err != nil {
+	if err = store.DeleteTicketsFromPendingRelease(ctx, ids); err != nil {
 		logger.WithFields(logrus.Fields{
 			"ticket_ids": ids,
 		}).Error(err)
@ -352,14 +367,18 @@ func doAssignTickets(ctx context.Context, req *pb.AssignTicketsRequest, store st
 	return resp, nil
 }

-func doReleasetickets(ctx context.Context, req *pb.ReleaseTicketsRequest, store statestore.Service) error {
-	err := store.DeleteTicketsFromIgnoreList(ctx, req.GetTicketIds())
+func recordTimeToAssignment(ctx context.Context, ticket *pb.Ticket) error {
+	if ticket.Assignment == nil {
+		return fmt.Errorf("assignment for ticket %s is nil", ticket.Id)
+	}
+
+	now := time.Now()
+	created, err := ptypes.Timestamp(ticket.CreateTime)
 	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"ticket_ids": req.GetTicketIds(),
-		}).WithError(err).Error("failed to delete the tickets from the ignore list")
 		return err
 	}

+	stats.Record(ctx, ticketsTimeToAssignment.M(now.Sub(created).Milliseconds()))
+
 	return nil
 }
--- a/internal/app/evaluator/defaulteval/evaluator.go
+++ b/internal/app/evaluator/defaulteval/evaluator.go
@ -16,12 +16,17 @@
 package defaulteval

 import (
+	"context"
 	"math"
 	"sort"

+	"go.opencensus.io/stats"
+
 	"github.com/golang/protobuf/ptypes"
 	"github.com/sirupsen/logrus"
+	"go.opencensus.io/stats/view"
 	"open-match.dev/open-match/internal/app/evaluator"
+	"open-match.dev/open-match/internal/appmain"
 	"open-match.dev/open-match/pkg/pb"
 )

@ -30,6 +35,14 @@ var (
 		"app":       "evaluator",
 		"component": "evaluator.default",
 	})
+
+	collidedMatchesPerEvaluate     = stats.Int64("open-match.dev/defaulteval/collided_matches_per_call", "Number of collided matches per default evaluator call", stats.UnitDimensionless)
+	collidedMatchesPerEvaluateView = &view.View{
+		Measure:     collidedMatchesPerEvaluate,
+		Name:        "open-match.dev/defaulteval/collided_matches_per_call",
+		Description: "Number of collided matches per default evaluator call",
+		Aggregation: view.Sum(),
+	}
 )

 type matchInp struct {
@ -37,13 +50,22 @@ type matchInp struct {
 	inp   *pb.DefaultEvaluationCriteria
 }

-// Evaluate sorts the matches by DefaultEvaluationCriteria.Score (optional),
+// BindService define the initialization steps for this evaluator
+func BindService(p *appmain.Params, b *appmain.Bindings) error {
+	if err := evaluator.BindServiceFor(evaluate)(p, b); err != nil {
+		return err
+	}
+	b.RegisterViews(collidedMatchesPerEvaluateView)
+	return nil
+}
+
+// evaluate sorts the matches by DefaultEvaluationCriteria.Score (optional),
 // then returns matches which don't collide with previously returned matches.
-func Evaluate(p *evaluator.Params) ([]string, error) {
-	matches := make([]*matchInp, 0, len(p.Matches))
+func evaluate(ctx context.Context, in <-chan *pb.Match, out chan<- string) error {
+	matches := make([]*matchInp, 0)
 	nilEvlautionInputs := 0

-	for _, m := range p.Matches {
+	for m := range in {
 		// Evaluation criteria is optional, but sort it lower than any matches which
 		// provided criteria.
 		inp := &pb.DefaultEvaluationCriteria{
@ -84,7 +106,13 @@ func Evaluate(p *evaluator.Params) ([]string, error) {
 		d.maybeAdd(m)
 	}

-	return d.resultIDs, nil
+	stats.Record(context.Background(), collidedMatchesPerEvaluate.M(int64(len(matches)-len(d.resultIDs))))
+
+	for _, id := range d.resultIDs {
+		out <- id
+	}
+
+	return nil
 }

 type collidingMatch struct {
--- a/internal/app/evaluator/defaulteval/evaluator_test.go
+++ b/internal/app/evaluator/defaulteval/evaluator_test.go
@ -15,13 +15,13 @@
 package defaulteval

 import (
+	"context"
 	"testing"

 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
-	"github.com/stretchr/testify/assert"
-	"open-match.dev/open-match/internal/app/evaluator"
+	"github.com/stretchr/testify/require"
 	"open-match.dev/open-match/pkg/pb"
 )

@ -114,13 +114,25 @@ func TestEvaluate(t *testing.T) {
 		test := test
 		t.Run(test.description, func(t *testing.T) {
 			t.Parallel()
-			gotMatchIDs, err := Evaluate(&evaluator.Params{Matches: test.testMatches})
+			in := make(chan *pb.Match, 10)
+			out := make(chan string, 10)
+			for _, m := range test.testMatches {
+				in <- m
+			}
+			close(in)

-			assert.Nil(t, err)
-			assert.Equal(t, len(test.wantMatchIDs), len(gotMatchIDs))
+			err := evaluate(context.Background(), in, out)
+			require.Nil(t, err)
+
+			gotMatchIDs := []string{}
+			close(out)
+			for id := range out {
+				gotMatchIDs = append(gotMatchIDs, id)
+			}
+			require.Equal(t, len(test.wantMatchIDs), len(gotMatchIDs))

 			for _, mID := range gotMatchIDs {
-				assert.Contains(t, test.wantMatchIDs, mID)
+				require.Contains(t, test.wantMatchIDs, mID)
 			}
 		})
 	}
--- a/internal/app/evaluator/evaluator.go
+++ b/internal/app/evaluator/evaluator.go
@ -16,35 +16,42 @@
 package evaluator

 import (
-	"github.com/spf13/viper"
+	"go.opencensus.io/stats"
+	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc"
-	"open-match.dev/open-match/internal/app"
-	"open-match.dev/open-match/internal/config"
-	"open-match.dev/open-match/internal/rpc"
+	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

-// RunEvaluator is a hook for the main() method in the main executable.
-func RunEvaluator(eval Evaluator) {
-	app.RunApplication("evaluator", getCfg, func(p *rpc.ServerParams, cfg config.View) error {
-		return BindService(p, cfg, eval)
-	})
-}
-
-// BindService creates the evaluator service to the server Params.
-func BindService(p *rpc.ServerParams, cfg config.View, eval Evaluator) error {
-	p.AddHandleFunc(func(s *grpc.Server) {
-		pb.RegisterEvaluatorServer(s, &evaluatorService{evaluate: eval})
-	}, pb.RegisterEvaluatorHandlerFromEndpoint)
-
-	return nil
-}
-
-func getCfg() (config.View, error) {
-	cfg := viper.New()
-	cfg.Set("api.evaluator.hostname", "om-evaluator")
-	cfg.Set("api.evaluator.grpcport", 50508)
-	cfg.Set("api.evaluator.httpport", 51508)
-
-	return cfg, nil
+var (
+	matchesPerEvaluateRequest  = stats.Int64("open-match.dev/evaluator/matches_per_request", "Number of matches sent to the evaluator per request", stats.UnitDimensionless)
+	matchesPerEvaluateResponse = stats.Int64("open-match.dev/evaluator/matches_per_response", "Number of matches returned by the evaluator per response", stats.UnitDimensionless)
+
+	matchesPerEvaluateRequestView = &view.View{
+		Measure:     matchesPerEvaluateRequest,
+		Name:        "open-match.dev/evaluator/matches_per_request",
+		Description: "Number of matches sent to the evaluator per request",
+		Aggregation: telemetry.DefaultCountDistribution,
+	}
+	matchesPerEvaluateResponseView = &view.View{
+		Measure:     matchesPerEvaluateResponse,
+		Name:        "open-match.dev/evaluator/matches_per_response",
+		Description: "Number of matches sent to the evaluator per response",
+		Aggregation: telemetry.DefaultCountDistribution,
+	}
+)
+
+// BindServiceFor creates the evaluator service and binds it to the serving harness.
+func BindServiceFor(eval Evaluator) appmain.Bind {
+	return func(p *appmain.Params, b *appmain.Bindings) error {
+		b.AddHandleFunc(func(s *grpc.Server) {
+			pb.RegisterEvaluatorServer(s, &evaluatorService{eval})
+		}, pb.RegisterEvaluatorHandlerFromEndpoint)
+		b.RegisterViews(
+			matchesPerEvaluateRequestView,
+			matchesPerEvaluateResponseView,
+		)
+		return nil
+	}
 }
--- a/internal/app/evaluator/evaluator_service.go
+++ b/internal/app/evaluator/evaluator_service.go
@ -16,26 +16,19 @@
 package evaluator

 import (
+	"context"
 	"io"

-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
+	"github.com/pkg/errors"
+	"go.opencensus.io/stats"
+	"golang.org/x/sync/errgroup"
 	"open-match.dev/open-match/pkg/pb"
-
-	"github.com/sirupsen/logrus"
-)
-
-var (
-	logger = logrus.WithFields(logrus.Fields{
-		"app":       "openmatch",
-		"component": "evaluator.harness.golang",
-	})
 )

 // Evaluator is the function signature for the Evaluator to be implemented by
 // the user. The harness will pass the Matches to evaluate to the Evaluator
 // and the Evaluator will return an accepted list of Matches.
-type Evaluator func(*Params) ([]string, error)
+type Evaluator func(ctx context.Context, in <-chan *pb.Match, out chan<- string) error

 // evaluatorService implements pb.EvaluatorServer, the server generated by
 // compiling the protobuf, by fulfilling the pb.EvaluatorServer interface.
@ -43,51 +36,57 @@ type evaluatorService struct {
 	evaluate Evaluator
 }

-// Params is the parameters to be passed by the harness to the evaluator.
-//  - logger:
-//			A logger used to generate error/debug logs
-//  - Matches
-//			Matches to be evaluated
-type Params struct {
-	Logger  *logrus.Entry
-	Matches []*pb.Match
-}
-
 // Evaluate is this harness's implementation of the gRPC call defined in
 // api/evaluator.proto.
 func (s *evaluatorService) Evaluate(stream pb.Evaluator_EvaluateServer) error {
-	var matches = []*pb.Match{}
-	for {
-		req, err := stream.Recv()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-		matches = append(matches, req.GetMatch())
-	}
+	g, ctx := errgroup.WithContext(stream.Context())

-	// Run the customized evaluator!
-	results, err := s.evaluate(&Params{
-		Logger: logrus.WithFields(logrus.Fields{
-			"app":       "openmatch",
-			"component": "evaluator.implementation",
-		}),
-		Matches: matches,
+	in := make(chan *pb.Match)
+	out := make(chan string)
+
+	g.Go(func() error {
+		defer close(in)
+		count := 0
+		for {
+			req, err := stream.Recv()
+			if err == io.EOF {
+				break
+			}
+			if err != nil {
+				return err
+			}
+			select {
+			case in <- req.Match:
+				count++
+			case <-ctx.Done():
+				return ctx.Err()
+			}
+		}
+		stats.Record(ctx, matchesPerEvaluateRequest.M(int64(count)))
+		return nil
 	})
-	if err != nil {
-		return status.Error(codes.Aborted, err.Error())
-	}
+	g.Go(func() error {
+		defer close(out)
+		return s.evaluate(ctx, in, out)
+	})
+	g.Go(func() error {
+		defer func() {
+			for range out {
+			}
+		}()

-	for _, result := range results {
-		if err := stream.Send(&pb.EvaluateResponse{MatchId: result}); err != nil {
-			return err
+		count := 0
+		for id := range out {
+			err := stream.Send(&pb.EvaluateResponse{MatchId: id})
+			if err != nil {
+				return err
+			}
+			count++
 		}
-	}
+		stats.Record(ctx, matchesPerEvaluateResponse.M(int64(count)))
+		return nil
+	})

-	logger.WithFields(logrus.Fields{
-		"results": results,
-	}).Debug("matches accepted by the evaluator")
-	return nil
+	err := g.Wait()
+	return errors.Wrap(err, "Error in evaluator.Evaluate")
 }
--- a/internal/app/frontend/frontend.go
+++ b/internal/app/frontend/frontend.go
@ -15,24 +15,47 @@
 package frontend

 import (
+	"go.opencensus.io/stats"
+	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc"
-	"open-match.dev/open-match/internal/config"
-	"open-match.dev/open-match/internal/rpc"
+	"open-match.dev/open-match/internal/appmain"
 	"open-match.dev/open-match/internal/statestore"
+	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

+var (
+	totalBytesPerTicket   = stats.Int64("open-match.dev/frontend/total_bytes_per_ticket", "Total bytes per ticket", stats.UnitBytes)
+	searchFieldsPerTicket = stats.Int64("open-match.dev/frontend/searchfields_per_ticket", "Searchfields per ticket", stats.UnitDimensionless)
+
+	totalBytesPerTicketView = &view.View{
+		Measure:     totalBytesPerTicket,
+		Name:        "open-match.dev/frontend/total_bytes_per_ticket",
+		Description: "Total bytes per ticket",
+		Aggregation: telemetry.DefaultBytesDistribution,
+	}
+	searchFieldsPerTicketView = &view.View{
+		Measure:     searchFieldsPerTicket,
+		Name:        "open-match.dev/frontend/searchfields_per_ticket",
+		Description: "SearchFields per ticket",
+		Aggregation: telemetry.DefaultCountDistribution,
+	}
+)
+
 // BindService creates the frontend service and binds it to the serving harness.
-func BindService(p *rpc.ServerParams, cfg config.View) error {
+func BindService(p *appmain.Params, b *appmain.Bindings) error {
 	service := &frontendService{
-		cfg:   cfg,
-		store: statestore.New(cfg),
+		cfg:   p.Config(),
+		store: statestore.New(p.Config()),
 	}

-	p.AddHealthCheckFunc(service.store.HealthCheck)
-	p.AddHandleFunc(func(s *grpc.Server) {
+	b.AddHealthCheckFunc(service.store.HealthCheck)
+	b.AddHandleFunc(func(s *grpc.Server) {
 		pb.RegisterFrontendServiceServer(s, service)
 	}, pb.RegisterFrontendServiceHandlerFromEndpoint)
-
+	b.RegisterViews(
+		totalBytesPerTicketView,
+		searchFieldsPerTicketView,
+	)
 	return nil
 }
--- a/internal/app/frontend/frontend_service.go
+++ b/internal/app/frontend/frontend_service.go
@ -22,12 +22,12 @@ import (
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/rs/xid"
 	"github.com/sirupsen/logrus"
+	"go.opencensus.io/stats"
 	"go.opencensus.io/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/statestore"
-	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

@ -43,10 +43,6 @@ var (
 		"app":       "openmatch",
 		"component": "app.frontend",
 	})
-	mTicketsCreated             = telemetry.Counter("frontend/tickets_created", "tickets created")
-	mTicketsDeleted             = telemetry.Counter("frontend/tickets_deleted", "tickets deleted")
-	mTicketsRetrieved           = telemetry.Counter("frontend/tickets_retrieved", "tickets retrieved")
-	mTicketAssignmentsRetrieved = telemetry.Counter("frontend/tickets_assignments_retrieved", "ticket assignments retrieved")
 )

 // CreateTicket assigns an unique TicketId to the input Ticket and record it in state storage.
@ -77,25 +73,24 @@ func doCreateTicket(ctx context.Context, req *pb.CreateTicketRequest, store stat

 	ticket.Id = xid.New().String()
 	ticket.CreateTime = ptypes.TimestampNow()
+
+	sfCount := 0
+	sfCount += len(ticket.GetSearchFields().GetDoubleArgs())
+	sfCount += len(ticket.GetSearchFields().GetStringArgs())
+	sfCount += len(ticket.GetSearchFields().GetTags())
+	stats.Record(ctx, searchFieldsPerTicket.M(int64(sfCount)))
+	stats.Record(ctx, totalBytesPerTicket.M(int64(proto.Size(ticket))))
+
 	err := store.CreateTicket(ctx, ticket)
 	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error":  err.Error(),
-			"ticket": ticket,
-		}).Error("failed to create the ticket")
 		return nil, err
 	}

 	err = store.IndexTicket(ctx, ticket)
 	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error":  err.Error(),
-			"ticket": ticket,
-		}).Error("failed to index the ticket")
 		return nil, err
 	}

-	telemetry.RecordUnitMeasurement(ctx, mTicketsCreated)
 	return ticket, nil
 }

@ -108,7 +103,6 @@ func (s *frontendService) DeleteTicket(ctx context.Context, req *pb.DeleteTicket
 	if err != nil {
 		return nil, err
 	}
-	telemetry.RecordUnitMeasurement(ctx, mTicketsDeleted)
 	return &empty.Empty{}, nil
 }

@ -116,10 +110,6 @@ func doDeleteTicket(ctx context.Context, id string, store statestore.Service) er
 	// Deindex this Ticket to remove it from matchmaking pool.
 	err := store.DeindexTicket(ctx, id)
 	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error": err.Error(),
-			"id":    id,
-		}).Error("failed to deindex the ticket")
 		return err
 	}

@ -135,12 +125,12 @@ func doDeleteTicket(ctx context.Context, id string, store statestore.Service) er
 				"id":    id,
 			}).Error("failed to delete the ticket")
 		}
-		err = store.DeleteTicketsFromIgnoreList(ctx, []string{id})
+		err = store.DeleteTicketsFromPendingRelease(ctx, []string{id})
 		if err != nil {
 			logger.WithFields(logrus.Fields{
 				"error": err.Error(),
 				"id":    id,
-			}).Error("failed to delete the ticket from ignorelist")
+			}).Error("failed to delete the ticket from pendingRelease")
 		}
 		// TODO: If other redis queues are implemented or we have custom index fields
 		// created by Open Match, those need to be cleaned up here.
@ -150,21 +140,7 @@ func doDeleteTicket(ctx context.Context, id string, store statestore.Service) er

 // GetTicket get the Ticket associated with the specified TicketId.
 func (s *frontendService) GetTicket(ctx context.Context, req *pb.GetTicketRequest) (*pb.Ticket, error) {
-	telemetry.RecordUnitMeasurement(ctx, mTicketsRetrieved)
-	return doGetTickets(ctx, req.GetTicketId(), s.store)
-}
-
-func doGetTickets(ctx context.Context, id string, store statestore.Service) (*pb.Ticket, error) {
-	ticket, err := store.GetTicket(ctx, id)
-	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error": err.Error(),
-			"id":    id,
-		}).Error("failed to get the ticket")
-		return nil, err
-	}
-
-	return ticket, nil
+	return s.store.GetTicket(ctx, req.GetTicketId())
 }

 // WatchAssignments stream back Assignment of the specified TicketId if it is updated.
@ -177,7 +153,6 @@ func (s *frontendService) WatchAssignments(req *pb.WatchAssignmentsRequest, stre
 			return ctx.Err()
 		default:
 			sender := func(assignment *pb.Assignment) error {
-				telemetry.RecordUnitMeasurement(ctx, mTicketAssignmentsRetrieved)
 				return stream.Send(&pb.WatchAssignmentsResponse{Assignment: assignment})
 			}
 			return doWatchAssignments(ctx, req.GetTicketId(), sender, s.store)
@ -197,7 +172,6 @@ func doWatchAssignments(ctx context.Context, id string, sender func(*pb.Assignme

 			err := sender(currAssignment)
 			if err != nil {
-				logger.WithError(err).Error("failed to send Redis response to grpc server")
 				return status.Errorf(codes.Aborted, err.Error())
 			}
 		}
--- a/internal/app/frontend/frontend_service_test.go
+++ b/internal/app/frontend/frontend_service_test.go
@ -23,7 +23,7 @@ import (
 	"time"

 	"github.com/spf13/viper"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"open-match.dev/open-match/internal/statestore"
@ -77,12 +77,12 @@ func TestDoCreateTickets(t *testing.T) {
 			test.preAction(cancel)

 			res, err := doCreateTicket(ctx, &pb.CreateTicketRequest{Ticket: test.ticket}, store)
-			assert.Equal(t, test.wantCode, status.Convert(err).Code())
+			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())
 			if err == nil {
 				matched, err := regexp.MatchString(`[0-9a-v]{20}`, res.GetId())
-				assert.True(t, matched)
-				assert.Nil(t, err)
-				assert.Equal(t, test.ticket.SearchFields.DoubleArgs["test-arg"], res.SearchFields.DoubleArgs["test-arg"])
+				require.True(t, matched)
+				require.Nil(t, err)
+				require.Equal(t, test.ticket.SearchFields.DoubleArgs["test-arg"], res.SearchFields.DoubleArgs["test-arg"])
 			}
 		})
 	}
@ -118,12 +118,12 @@ func TestDoWatchAssignments(t *testing.T) {
 		{
 			description: "expect two assignment reads from preAction writes and fail in grpc aborted code",
 			preAction: func(ctx context.Context, t *testing.T, store statestore.Service, wantAssignments []*pb.Assignment, wg *sync.WaitGroup) {
-				assert.Nil(t, store.CreateTicket(ctx, testTicket))
+				require.Nil(t, store.CreateTicket(ctx, testTicket))

 				go func(wg *sync.WaitGroup) {
 					for i := 0; i < len(wantAssignments); i++ {
 						time.Sleep(50 * time.Millisecond)
-						_, err := store.UpdateAssignments(ctx, &pb.AssignTicketsRequest{
+						_, _, err := store.UpdateAssignments(ctx, &pb.AssignTicketsRequest{
 							Assignments: []*pb.AssignmentGroup{
 								{
 									TicketIds:  []string{testTicket.GetId()},
@ -131,7 +131,7 @@ func TestDoWatchAssignments(t *testing.T) {
 								},
 							},
 						})
-						assert.Nil(t, err)
+						require.Nil(t, err)
 						wg.Done()
 					}
 				}(wg)
@ -155,11 +155,11 @@ func TestDoWatchAssignments(t *testing.T) {

 			test.preAction(ctx, t, store, test.wantAssignments, &wg)
 			err := doWatchAssignments(ctx, testTicket.GetId(), senderGenerator(gotAssignments, len(test.wantAssignments)), store)
-			assert.Equal(t, test.wantCode, status.Convert(err).Code())
+			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())

 			wg.Wait()
 			for i := 0; i < len(gotAssignments); i++ {
-				assert.Equal(t, gotAssignments[i], test.wantAssignments[i])
+				require.Equal(t, gotAssignments[i], test.wantAssignments[i])
 			}
 		})
 	}
@ -211,7 +211,7 @@ func TestDoDeleteTicket(t *testing.T) {
 			test.preAction(ctx, cancel, store)

 			err := doDeleteTicket(ctx, fakeTicket.GetId(), store)
-			assert.Equal(t, test.wantCode, status.Convert(err).Code())
+			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())
 		})
 	}
 }
@ -264,12 +264,12 @@ func TestDoGetTicket(t *testing.T) {

 			test.preAction(ctx, cancel, store)

-			ticket, err := doGetTickets(ctx, fakeTicket.GetId(), store)
-			assert.Equal(t, test.wantCode, status.Convert(err).Code())
+			ticket, err := store.GetTicket(ctx, fakeTicket.GetId())
+			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())

 			if err == nil {
-				assert.Equal(t, test.wantTicket.GetId(), ticket.GetId())
-				assert.Equal(t, test.wantTicket.SearchFields.DoubleArgs, ticket.SearchFields.DoubleArgs)
+				require.Equal(t, test.wantTicket.GetId(), ticket.GetId())
+				require.Equal(t, test.wantTicket.SearchFields.DoubleArgs, ticket.SearchFields.DoubleArgs)
 			}
 		})
 	}
--- a/internal/app/minimatch/minimatch.go
+++ b/internal/app/minimatch/minimatch.go
@ -19,25 +19,24 @@ import (
 	"open-match.dev/open-match/internal/app/frontend"
 	"open-match.dev/open-match/internal/app/query"
 	"open-match.dev/open-match/internal/app/synchronizer"
-	"open-match.dev/open-match/internal/config"
-	"open-match.dev/open-match/internal/rpc"
+	"open-match.dev/open-match/internal/appmain"
 )

 // BindService creates the minimatch service to the server Params.
-func BindService(p *rpc.ServerParams, cfg config.View) error {
-	if err := backend.BindService(p, cfg); err != nil {
+func BindService(p *appmain.Params, b *appmain.Bindings) error {
+	if err := backend.BindService(p, b); err != nil {
 		return err
 	}

-	if err := frontend.BindService(p, cfg); err != nil {
+	if err := frontend.BindService(p, b); err != nil {
 		return err
 	}

-	if err := query.BindService(p, cfg); err != nil {
+	if err := query.BindService(p, b); err != nil {
 		return err
 	}

-	if err := synchronizer.BindService(p, cfg); err != nil {
+	if err := synchronizer.BindService(p, b); err != nil {
 		return err
 	}

--- a/internal/app/query/query.go
+++ b/internal/app/query/query.go
@ -15,22 +15,76 @@
 package query

 import (
+	"go.opencensus.io/stats"
+	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc"
-	"open-match.dev/open-match/internal/config"
-	"open-match.dev/open-match/internal/rpc"
+	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

+var (
+	ticketsPerQuery     = stats.Int64("open-match.dev/query/tickets_per_query", "Number of tickets per query", stats.UnitDimensionless)
+	cacheTotalItems     = stats.Int64("open-match.dev/query/total_cache_items", "Total number of tickets query service cached", stats.UnitDimensionless)
+	cacheFetchedItems   = stats.Int64("open-match.dev/query/fetched_items", "Number of fetched items in total", stats.UnitDimensionless)
+	cacheWaitingQueries = stats.Int64("open-match.dev/query/waiting_queries", "Number of waiting queries in the last update", stats.UnitDimensionless)
+	cacheUpdateLatency  = stats.Float64("open-match.dev/query/update_latency", "Time elapsed of each query cache update", stats.UnitMilliseconds)
+
+	ticketsPerQueryView = &view.View{
+		Measure:     ticketsPerQuery,
+		Name:        "open-match.dev/query/tickets_per_query",
+		Description: "Tickets per query",
+		Aggregation: telemetry.DefaultCountDistribution,
+	}
+	cacheTotalItemsView = &view.View{
+		Measure:     cacheTotalItems,
+		Name:        "open-match.dev/query/total_cached_items",
+		Description: "Total number of cached tickets",
+		Aggregation: view.LastValue(),
+	}
+	cacheFetchedItemsView = &view.View{
+		Measure:     cacheFetchedItems,
+		Name:        "open-match.dev/query/total_fetched_items",
+		Description: "Total number of fetched tickets",
+		Aggregation: view.Sum(),
+	}
+	cacheUpdateView = &view.View{
+		Measure:     cacheWaitingQueries,
+		Name:        "open-match.dev/query/cache_updates",
+		Description: "Number of query cache updates in total",
+		Aggregation: view.Count(),
+	}
+	cacheWaitingQueriesView = &view.View{
+		Measure:     cacheWaitingQueries,
+		Name:        "open-match.dev/query/waiting_requests",
+		Description: "Number of waiting requests in total",
+		Aggregation: telemetry.DefaultCountDistribution,
+	}
+	cacheUpdateLatencyView = &view.View{
+		Measure:     cacheUpdateLatency,
+		Name:        "open-match.dev/query/update_latency",
+		Description: "Time elapsed of each query cache update",
+		Aggregation: telemetry.DefaultMillisecondsDistribution,
+	}
+)
+
 // BindService creates the query service and binds it to the serving harness.
-func BindService(p *rpc.ServerParams, cfg config.View) error {
+func BindService(p *appmain.Params, b *appmain.Bindings) error {
 	service := &queryService{
-		cfg: cfg,
-		tc:  newTicketCache(p, cfg),
+		cfg: p.Config(),
+		tc:  newTicketCache(b, p.Config()),
 	}

-	p.AddHandleFunc(func(s *grpc.Server) {
+	b.AddHandleFunc(func(s *grpc.Server) {
 		pb.RegisterQueryServiceServer(s, service)
 	}, pb.RegisterQueryServiceHandlerFromEndpoint)
-
+	b.RegisterViews(
+		ticketsPerQueryView,
+		cacheTotalItemsView,
+		cacheUpdateView,
+		cacheFetchedItemsView,
+		cacheWaitingQueriesView,
+		cacheUpdateLatencyView,
+	)
 	return nil
 }
--- a/internal/app/query/query_service.go
+++ b/internal/app/query/query_service.go
@ -17,14 +17,17 @@ package query
 import (
 	"context"
 	"sync"
+	"time"
+
+	"go.opencensus.io/stats"

 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"open-match.dev/open-match/internal/appmain"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/filter"
-	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/statestore"
 	"open-match.dev/open-match/pkg/pb"
 )
@ -44,6 +47,7 @@ type queryService struct {
 }

 func (s *queryService) QueryTickets(req *pb.QueryTicketsRequest, responseServer pb.QueryService_QueryTicketsServer) error {
+	ctx := responseServer.Context()
 	pool := req.GetPool()
 	if pool == nil {
 		return status.Error(codes.InvalidArgument, ".pool is required")
@ -55,7 +59,7 @@ func (s *queryService) QueryTickets(req *pb.QueryTicketsRequest, responseServer
 	}

 	var results []*pb.Ticket
-	err = s.tc.request(responseServer.Context(), func(tickets map[string]*pb.Ticket) {
+	err = s.tc.request(ctx, func(tickets map[string]*pb.Ticket) {
 		for _, ticket := range tickets {
 			if pf.In(ticket) {
 				results = append(results, ticket)
@ -63,9 +67,10 @@ func (s *queryService) QueryTickets(req *pb.QueryTicketsRequest, responseServer
 		}
 	})
 	if err != nil {
-		logger.WithError(err).Error("Failed to run request.")
+		err = errors.Wrap(err, "QueryTickets: failed to run request")
 		return err
 	}
+	stats.Record(ctx, ticketsPerQuery.M(int64(len(results))))

 	pSize := getPageSize(s.cfg)
 	for start := 0; start < len(results); start += pSize {
@ -86,6 +91,7 @@ func (s *queryService) QueryTickets(req *pb.QueryTicketsRequest, responseServer
 }

 func (s *queryService) QueryTicketIds(req *pb.QueryTicketIdsRequest, responseServer pb.QueryService_QueryTicketIdsServer) error {
+	ctx := responseServer.Context()
 	pool := req.GetPool()
 	if pool == nil {
 		return status.Error(codes.InvalidArgument, ".pool is required")
@ -97,7 +103,7 @@ func (s *queryService) QueryTicketIds(req *pb.QueryTicketIdsRequest, responseSer
 	}

 	var results []string
-	err = s.tc.request(responseServer.Context(), func(tickets map[string]*pb.Ticket) {
+	err = s.tc.request(ctx, func(tickets map[string]*pb.Ticket) {
 		for id, ticket := range tickets {
 			if pf.In(ticket) {
 				results = append(results, id)
@ -105,9 +111,10 @@ func (s *queryService) QueryTicketIds(req *pb.QueryTicketIdsRequest, responseSer
 		}
 	})
 	if err != nil {
-		logger.WithError(err).Error("Failed to run request.")
+		err = errors.Wrap(err, "QueryTicketIds: failed to run request")
 		return err
 	}
+	stats.Record(ctx, ticketsPerQuery.M(int64(len(results))))

 	pSize := getPageSize(s.cfg)
 	for start := 0; start < len(results); start += pSize {
@ -129,7 +136,7 @@ func (s *queryService) QueryTicketIds(req *pb.QueryTicketIdsRequest, responseSer

 func getPageSize(cfg config.View) int {
 	const (
-		name = "storage.page.size"
+		name = "queryPageSize"
 		// Minimum number of tickets to be returned in a streamed response for QueryTickets. This value
 		// will be used if page size is configured lower than the minimum value.
 		minPageSize int = 10
@ -145,7 +152,7 @@ func getPageSize(cfg config.View) int {
 		return defaultPageSize
 	}

-	pSize := cfg.GetInt("storage.page.size")
+	pSize := cfg.GetInt(name)
 	if pSize < minPageSize {
 		logger.Infof("page size %v is lower than the minimum limit of %v", pSize, maxPageSize)
 		pSize = minPageSize
@ -182,7 +189,7 @@ type ticketCache struct {
 	err     error
 }

-func newTicketCache(p *rpc.ServerParams, cfg config.View) *ticketCache {
+func newTicketCache(b *appmain.Bindings, cfg config.View) *ticketCache {
 	tc := &ticketCache{
 		store:           statestore.New(cfg),
 		requests:        make(chan *cacheRequest),
@ -191,7 +198,7 @@ func newTicketCache(p *rpc.ServerParams, cfg config.View) *ticketCache {
 	}

 	tc.startRunRequest <- struct{}{}
-	p.AddHealthCheckFunc(tc.store.HealthCheck)
+	b.AddHealthCheckFunc(tc.store.HealthCheck)

 	return tc
 }
@ -254,6 +261,7 @@ collectAllWaiting:
 	}

 	tc.update()
+	stats.Record(context.Background(), cacheWaitingQueries.M(int64(len(reqs))))

 	// Send WaitGroup to query calls, letting them run their query on the ticket
 	// cache.
@ -271,6 +279,7 @@ collectAllWaiting:
 }

 func (tc *ticketCache) update() {
+	st := time.Now()
 	previousCount := len(tc.tickets)

 	currentAll, err := tc.store.GetIndexedIDSet(context.Background())
@ -305,6 +314,10 @@ func (tc *ticketCache) update() {
 		tc.tickets[t.Id] = t
 	}

+	stats.Record(context.Background(), cacheTotalItems.M(int64(previousCount)))
+	stats.Record(context.Background(), cacheFetchedItems.M(int64(len(toFetch))))
+	stats.Record(context.Background(), cacheUpdateLatency.M(float64(time.Since(st))/float64(time.Millisecond)))
+
 	logger.Debugf("Ticket Cache update: Previous %d, Deleted %d, Fetched %d, Current %d", previousCount, deletedCount, len(toFetch), len(tc.tickets))
 	tc.err = nil
 }
--- a/internal/app/query/query_service_test.go
+++ b/internal/app/query/query_service_test.go
@ -18,6 +18,7 @@ import (
 	"testing"

 	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
 	"open-match.dev/open-match/internal/config"
 )

@ -35,21 +36,21 @@ func TestGetPageSize(t *testing.T) {
 		{
 			"set",
 			func(cfg config.Mutable) {
-				cfg.Set("storage.page.size", "2156")
+				cfg.Set("queryPageSize", "2156")
 			},
 			2156,
 		},
 		{
 			"low",
 			func(cfg config.Mutable) {
-				cfg.Set("storage.page.size", "9")
+				cfg.Set("queryPageSize", "9")
 			},
 			10,
 		},
 		{
 			"high",
 			func(cfg config.Mutable) {
-				cfg.Set("storage.page.size", "10001")
+				cfg.Set("queryPageSize", "10001")
 			},
 			10000,
 		},
@ -61,9 +62,7 @@ func TestGetPageSize(t *testing.T) {
 			cfg := viper.New()
 			tt.configure(cfg)
 			actual := getPageSize(cfg)
-			if actual != tt.expected {
-				t.Errorf("got %d, want %d", actual, tt.expected)
-			}
+			require.Equal(t, tt.expected, actual)
 		})
 	}
 }
--- a/internal/app/swaggerui/swaggerui.go
+++ b/internal/app/swaggerui/swaggerui.go
@ -53,8 +53,6 @@ func RunApplication() {

 func serve(cfg config.View) {
 	mux := &http.ServeMux{}
-	closer := telemetry.Setup("swaggerui", mux, cfg)
-	defer closer()
 	port := cfg.GetInt("api.swaggerui.httpport")
 	baseDir, err := os.Getwd()
 	if err != nil {
--- a/internal/app/synchronizer/evaluator_client.go
+++ b/internal/app/synchronizer/evaluator_client.go
@ -40,7 +40,7 @@ var (
 )

 type evaluator interface {
-	evaluate(context.Context, <-chan []*pb.Match) ([]string, error)
+	evaluate(context.Context, <-chan []*pb.Match, chan<- string) error
 }

 var errNoEvaluatorType = status.Errorf(codes.FailedPrecondition, "unable to determine evaluator type, either api.evaluator.grpcport or api.evaluator.httpport must be specified in the config")
@ -66,17 +66,17 @@ type deferredEvaluator struct {
 	cacher *config.Cacher
 }

-func (de *deferredEvaluator) evaluate(ctx context.Context, pc <-chan []*pb.Match) ([]string, error) {
+func (de *deferredEvaluator) evaluate(ctx context.Context, pc <-chan []*pb.Match, acceptedIds chan<- string) error {
 	e, err := de.cacher.Get()
 	if err != nil {
-		return nil, err
+		return err
 	}

-	matches, err := e.(evaluator).evaluate(ctx, pc)
+	err = e.(evaluator).evaluate(ctx, pc, acceptedIds)
 	if err != nil {
 		de.cacher.ForceReset()
 	}
-	return matches, err
+	return err
 }

 type grcpEvaluatorClient struct {
@ -106,7 +106,7 @@ func newGrpcEvaluator(cfg config.View) (evaluator, func(), error) {
 	}, close, nil
 }

-func (ec *grcpEvaluatorClient) evaluate(ctx context.Context, pc <-chan []*pb.Match) ([]string, error) {
+func (ec *grcpEvaluatorClient) evaluate(ctx context.Context, pc <-chan []*pb.Match, acceptedIds chan<- string) error {
 	eg, ctx := errgroup.WithContext(ctx)

 	var stream pb.Evaluator_EvaluateClient
@ -114,18 +114,17 @@ func (ec *grcpEvaluatorClient) evaluate(ctx context.Context, pc <-chan []*pb.Mat
 		var err error
 		stream, err = ec.evaluator.Evaluate(ctx)
 		if err != nil {
-			return nil, fmt.Errorf("error starting evaluator call: %w", err)
+			return fmt.Errorf("error starting evaluator call: %w", err)
 		}
 	}

-	results := []string{}
 	matchIDs := &sync.Map{}
-
 	eg.Go(func() error {
 		for proposals := range pc {
 			for _, proposal := range proposals {
+
 				if _, ok := matchIDs.LoadOrStore(proposal.GetMatchId(), true); ok {
-					return fmt.Errorf("found duplicate matchID %s", proposal.GetMatchId())
+					return fmt.Errorf("multiple match functions used same match_id: \"%s\"", proposal.GetMatchId())
 				}
 				if err := stream.Send(&pb.EvaluateRequest{Match: proposal}); err != nil {
 					return fmt.Errorf("failed to send request to evaluator, desc: %w", err)
@ -150,22 +149,23 @@ func (ec *grcpEvaluatorClient) evaluate(ctx context.Context, pc <-chan []*pb.Mat
 				return fmt.Errorf("failed to get response from evaluator client, desc: %w", err)
 			}

-			v, ok := matchIDs.LoadOrStore(resp.GetMatchId(), false)
+			v, ok := matchIDs.Load(resp.GetMatchId())
 			if !ok {
-				return fmt.Errorf("evaluator returned unmatched matchID %s which does not correspond to its input", resp.GetMatchId())
+				return fmt.Errorf("evaluator returned match_id \"%s\" which does not correspond to its any match in its input", resp.GetMatchId())
 			}
 			if !v.(bool) {
-				return fmt.Errorf("evaluator returned duplicated matchID %s", resp.GetMatchId())
+				return fmt.Errorf("evaluator returned same match_id twice: \"%s\"", resp.GetMatchId())
 			}
-			results = append(results, resp.GetMatchId())
+			matchIDs.Store(resp.GetMatchId(), false)
+			acceptedIds <- resp.GetMatchId()
 		}
 	})

 	err := eg.Wait()
 	if err != nil {
-		return nil, err
+		return err
 	}
-	return results, nil
+	return nil
 }

 type httpEvaluatorClient struct {
@ -194,7 +194,7 @@ func newHTTPEvaluator(cfg config.View) (evaluator, func(), error) {
 	}, close, nil
 }

-func (ec *httpEvaluatorClient) evaluate(ctx context.Context, pc <-chan []*pb.Match) ([]string, error) {
+func (ec *httpEvaluatorClient) evaluate(ctx context.Context, pc <-chan []*pb.Match, acceptedIds chan<- string) error {
 	reqr, reqw := io.Pipe()
 	var wg sync.WaitGroup
 	wg.Add(1)
@ -227,14 +227,14 @@ func (ec *httpEvaluatorClient) evaluate(ctx context.Context, pc <-chan []*pb.Mat

 	req, err := http.NewRequest("POST", ec.baseURL+"/v1/evaluator/matches:evaluate", reqr)
 	if err != nil {
-		return nil, status.Errorf(codes.Aborted, "failed to create evaluator http request, desc: %s", err.Error())
+		return status.Errorf(codes.Aborted, "failed to create evaluator http request, desc: %s", err.Error())
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Transfer-Encoding", "chunked")

 	resp, err := ec.httpClient.Do(req.WithContext(ctx))
 	if err != nil {
-		return nil, status.Errorf(codes.Aborted, "failed to get response from evaluator, desc: %s", err.Error())
+		return status.Errorf(codes.Aborted, "failed to get response from evaluator, desc: %s", err.Error())
 	}
 	defer func() {
 		if resp.Body.Close() != nil {
@ -243,7 +243,6 @@ func (ec *httpEvaluatorClient) evaluate(ctx context.Context, pc <-chan []*pb.Mat
 	}()

 	wg.Add(1)
-	var results = []string{}
 	rc := make(chan error, 1)
 	defer close(rc)
 	go func() {
@ -272,16 +271,16 @@ func (ec *httpEvaluatorClient) evaluate(ctx context.Context, pc <-chan []*pb.Mat
 				rc <- status.Errorf(codes.Unavailable, "failed to execute jsonpb.UnmarshalString(%s, &proposal): %v.", item.Result, err)
 				return
 			}
-			results = append(results, resp.GetMatchId())
+			acceptedIds <- resp.GetMatchId()
 		}
 	}()

 	wg.Wait()
 	if len(sc) != 0 {
-		return nil, <-sc
+		return <-sc
 	}
 	if len(rc) != 0 {
-		return nil, <-rc
+		return <-rc
 	}
-	return results, nil
+	return nil
 }
--- a/internal/app/synchronizer/synchronizer.go
+++ b/internal/app/synchronizer/synchronizer.go
@ -15,21 +15,52 @@
 package synchronizer

 import (
+	"go.opencensus.io/stats"
+	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc"
-	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/appmain"
 	"open-match.dev/open-match/internal/ipb"
-	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/statestore"
+	"open-match.dev/open-match/internal/telemetry"
+)
+
+var (
+	iterationLatency        = stats.Float64("open-match.dev/synchronizer/iteration_latency", "Time elapsed of each synchronizer iteration", stats.UnitMilliseconds)
+	registrationWaitTime    = stats.Float64("open-match.dev/synchronizer/registration_wait_time", "Time elapsed of registration wait time", stats.UnitMilliseconds)
+	registrationMMFDoneTime = stats.Float64("open-match.dev/synchronizer/registration_mmf_done_time", "Time elapsed wasted in registration window with done MMFs", stats.UnitMilliseconds)
+
+	iterationLatencyView = &view.View{
+		Measure:     iterationLatency,
+		Name:        "open-match.dev/synchronizer/iteration_latency",
+		Description: "Time elapsed of each synchronizer iteration",
+		Aggregation: telemetry.DefaultMillisecondsDistribution,
+	}
+	registrationWaitTimeView = &view.View{
+		Measure:     registrationWaitTime,
+		Name:        "open-match.dev/synchronizer/registration_wait_time",
+		Description: "Time elapsed of registration wait time",
+		Aggregation: telemetry.DefaultMillisecondsDistribution,
+	}
+	registrationMMFDoneTimeView = &view.View{
+		Measure:     registrationMMFDoneTime,
+		Name:        "open-match.dev/synchronizer/registration_mmf_done_time",
+		Description: "Time elapsed wasted in registration window with done MMFs",
+		Aggregation: telemetry.DefaultMillisecondsDistribution,
+	}
 )

 // BindService creates the synchronizer service and binds it to the serving harness.
-func BindService(p *rpc.ServerParams, cfg config.View) error {
-	store := statestore.New(cfg)
-	service := newSynchronizerService(cfg, newEvaluator(cfg), store)
-	p.AddHealthCheckFunc(store.HealthCheck)
-	p.AddHandleFunc(func(s *grpc.Server) {
+func BindService(p *appmain.Params, b *appmain.Bindings) error {
+	store := statestore.New(p.Config())
+	service := newSynchronizerService(p.Config(), newEvaluator(p.Config()), store)
+	b.AddHealthCheckFunc(store.HealthCheck)
+	b.AddHandleFunc(func(s *grpc.Server) {
 		ipb.RegisterSynchronizerServer(s, service)
 	}, nil)
-
+	b.RegisterViews(
+		iterationLatencyView,
+		registrationWaitTimeView,
+		registrationMMFDoneTimeView,
+	)
 	return nil
 }
--- a/internal/app/synchronizer/synchronizer_service.go
+++ b/internal/app/synchronizer/synchronizer_service.go
@ -21,7 +21,10 @@ import (
 	"sync"
 	"time"

+	"go.opencensus.io/stats"
+
 	"github.com/sirupsen/logrus"
+	"open-match.dev/open-match/internal/appmain/contextcause"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/ipb"
 	"open-match.dev/open-match/internal/statestore"
@ -40,7 +43,7 @@ var (

 // Streams from multiple GRPC calls of matches are combined on a single channel.
 // These matches are sent to the evaluator, then the tickets are added to the
-// ignore list.  Finally the matches are returned to the calling stream.
+// pending release list.  Finally the matches are returned to the calling stream.

 // receive from backend                  | Synchronize
 //  -> m1c ->
@ -52,7 +55,7 @@ var (
 //   -> m4c -> (buffered)
 // send to evaluator                     | wrapEvaluator
 //   -> m5c -> (buffered)
-// add tickets to ignore list            | addMatchesToIgnoreList
+// add tickets to pending release            | addMatchesToPendingRelease
 //   -> m6c ->
 // fan out to origin synchronize call    | fanInFanOut
 //   -> (Synchronize call specific ) m7c -> (buffered)
@ -123,7 +126,11 @@ func (s *synchronizerService) Synchronize(stream ipb.Synchronizer_SynchronizeSer
 		select {
 		case mIDs, ok := <-m6cBuffer:
 			if !ok {
-				return nil
+				// Prevent race: An error will result in this channel being
+				// closed as part of cleanup.  If it's especially fast, it may
+				// beat the context done case, so be sure to return any
+				// potential error.
+				return registration.cycleCtx.Err()
 			}
 			for _, mID := range mIDs {
 				err = stream.Send(&ipb.SynchronizeResponse{MatchId: mID})
@ -181,6 +188,9 @@ func (s synchronizerService) register(ctx context.Context) *registration {
 		resp: make(chan *registration),
 		ctx:  ctx,
 	}
+
+	st := time.Now()
+	defer stats.Record(ctx, registrationWaitTime.M(float64(time.Since(st))/float64(time.Millisecond)))
 	for {
 		select {
 		case s.synchronizeRegistration <- req:
@ -198,8 +208,9 @@ func (s synchronizerService) register(ctx context.Context) *registration {
 ///////////////////////////////////////

 func (s *synchronizerService) runCycle() {
+	cst := time.Now()
 	/////////////////////////////////////// Initialize cycle
-	ctx, cancel := withCancelCause(context.Background())
+	ctx, cancel := contextcause.WithCancelCause(context.Background())

 	m2c := make(chan mAndM6c)
 	m3c := make(chan *pb.Match)
@ -229,13 +240,14 @@ func (s *synchronizerService) runCycle() {
 	go s.cacheMatchIDToTicketIDs(matchTickets, m3c, m4c)
 	go s.wrapEvaluator(ctx, cancel, bufferMatchChannel(m4c), m5c)
 	go func() {
-		s.addMatchesToIgnoreList(ctx, matchTickets, cancel, bufferStringChannel(m5c), m6c)
-		// Wait for ignore list, but not all matches returned, the next cycle
+		s.addMatchesToPendingRelease(ctx, matchTickets, cancel, bufferStringChannel(m5c), m6c)
+		// Wait for pending release, but not all matches returned, the next cycle
 		// can start now.
 		close(closedOnCycleEnd)
 	}()

 	/////////////////////////////////////// Run Registration Period
+	rst := time.Now()
 	closeRegistration := time.After(s.registrationInterval())
 Registration:
 	for {
@ -268,6 +280,7 @@ Registration:
 	go func() {
 		allM1cSent.Wait()
 		m1c.cutoff()
+		stats.Record(ctx, registrationMMFDoneTime.M(float64((s.registrationInterval()-time.Since(rst))/time.Millisecond)))
 	}()

 	cancelProposalCollection := time.AfterFunc(s.proposalCollectionInterval(), func() {
@ -277,6 +290,7 @@ Registration:
 		}
 	})
 	<-closedOnCycleEnd
+	stats.Record(ctx, iterationLatency.M(float64(time.Since(cst)/time.Millisecond)))

 	// Clean up in case it was never needed.
 	cancelProposalCollection.Stop()
@ -387,13 +401,9 @@ func (c *cutoffSender) cutoff() {
 ///////////////////////////////////////

 // Calls the evaluator with the matches.
-func (s *synchronizerService) wrapEvaluator(ctx context.Context, cancel cancelErrFunc, m3c <-chan []*pb.Match, m5c chan<- string) {
-	matchIDs, err := s.eval.evaluate(ctx, m3c)
-	if err == nil {
-		for _, mID := range matchIDs {
-			m5c <- mID
-		}
-	} else {
+func (s *synchronizerService) wrapEvaluator(ctx context.Context, cancel contextcause.CancelErrFunc, m4c <-chan []*pb.Match, m5c chan<- string) {
+	err := s.eval.evaluate(ctx, m4c, m5c)
+	if err != nil {
 		logger.WithFields(logrus.Fields{
 			"error": err,
 		}).Error("error calling evaluator, canceling cycle")
@ -425,10 +435,10 @@ func getTicketIds(tickets []*pb.Ticket) []string {
 ///////////////////////////////////////

 // Calls statestore to add all of the tickets returned by the evaluator to the
-// ignorelist.  If it partially fails for whatever reason (not all tickets will
+// pendingRelease list.  If it partially fails for whatever reason (not all tickets will
 // nessisarily be in the same call), only the matches which can be safely
 // returned to the Synchronize calls are.
-func (s *synchronizerService) addMatchesToIgnoreList(ctx context.Context, m *sync.Map, cancel cancelErrFunc, m5c <-chan []string, m6c chan<- string) {
+func (s *synchronizerService) addMatchesToPendingRelease(ctx context.Context, m *sync.Map, cancel contextcause.CancelErrFunc, m5c <-chan []string, m6c chan<- string) {
 	totalMatches := 0
 	successfulMatches := 0
 	var lastErr error
@ -443,7 +453,7 @@ func (s *synchronizerService) addMatchesToIgnoreList(ctx context.Context, m *syn
 			}
 		}

-		err := s.store.AddTicketsToIgnoreList(ctx, ids)
+		err := s.store.AddTicketsToPendingRelease(ctx, ids)

 		totalMatches += len(mIDs)
 		if err == nil {
@ -462,10 +472,10 @@ func (s *synchronizerService) addMatchesToIgnoreList(ctx context.Context, m *syn
 			"error":             lastErr.Error(),
 			"totalMatches":      totalMatches,
 			"successfulMatches": successfulMatches,
-		}).Error("some or all matches were not successfully added to the ignore list, failed matches dropped")
+		}).Error("some or all matches were not successfully added to the pending release, failed matches dropped")

 		if successfulMatches == 0 {
-			cancel(fmt.Errorf("no matches successfully added to the ignore list.  Last error: %w", lastErr))
+			cancel(fmt.Errorf("no matches successfully added to the pending release.  Last error: %w", lastErr))
 		}
 	}
 	close(m6c)
@ -476,7 +486,7 @@ func (s *synchronizerService) addMatchesToIgnoreList(ctx context.Context, m *syn

 func (s *synchronizerService) registrationInterval() time.Duration {
 	const (
-		name            = "synchronizer.registrationIntervalMs"
+		name            = "registrationInterval"
 		defaultInterval = time.Second
 	)

@ -489,7 +499,7 @@ func (s *synchronizerService) registrationInterval() time.Duration {

 func (s *synchronizerService) proposalCollectionInterval() time.Duration {
 	const (
-		name            = "synchronizer.proposalCollectionIntervalMs"
+		name            = "proposalCollectionInterval"
 		defaultInterval = 10 * time.Second
 	)

@ -578,46 +588,3 @@ func bufferStringChannel(in chan string) chan []string {
 	}()
 	return out
 }
-
-///////////////////////////////////////
-///////////////////////////////////////
-
-// withCancelCause returns a copy of parent with a new Done channel. The
-// returned context's Done channel is closed when the returned cancel function
-// is called or when the parent context's Done channel is closed, whichever
-// happens first.  Unlike the conext package's WithCancel, the cancel func takes
-// an error, and will return that error on subsequent calls to Err().
-func withCancelCause(parent context.Context) (context.Context, cancelErrFunc) {
-	parent, cancel := context.WithCancel(parent)
-
-	ctx := &contextWithCancelCause{
-		Context: parent,
-	}
-
-	return ctx, func(err error) {
-		ctx.m.Lock()
-		defer ctx.m.Unlock()
-
-		if ctx.err == nil && parent.Err() == nil {
-			ctx.err = err
-		}
-		cancel()
-	}
-}
-
-type cancelErrFunc func(err error)
-
-type contextWithCancelCause struct {
-	context.Context
-	m   sync.Mutex
-	err error
-}
-
-func (ctx *contextWithCancelCause) Err() error {
-	ctx.m.Lock()
-	defer ctx.m.Unlock()
-	if ctx.err == nil {
-		return ctx.Context.Err()
-	}
-	return ctx.err
-}
--- a/internal/appmain/appmain.go
+++ b/internal/appmain/appmain.go
@ -0,0 +1,220 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package appmain contains the common application initialization code for Open Match servers.
+package appmain
+
+import (
+	"context"
+	"net"
+	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"go.opencensus.io/stats/view"
+
+	"github.com/sirupsen/logrus"
+	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/logging"
+	"open-match.dev/open-match/internal/rpc"
+	"open-match.dev/open-match/internal/telemetry"
+)
+
+var (
+	logger = logrus.WithFields(logrus.Fields{
+		"app":       "openmatch",
+		"component": "app.main",
+	})
+)
+
+// RunApplication starts and runs the given application forever.  For use in
+// main functions to run the full application.
+func RunApplication(serviceName string, bindService Bind) {
+	c := make(chan os.Signal, 1)
+	// SIGTERM is signaled by k8s when it wants a pod to stop.
+	signal.Notify(c, syscall.SIGTERM, syscall.SIGINT)
+
+	readConfig := func() (config.View, error) {
+		return config.Read()
+	}
+
+	a, err := NewApplication(serviceName, bindService, readConfig, net.Listen)
+	if err != nil {
+		logger.Fatal(err)
+	}
+
+	<-c
+	err = a.Stop()
+	if err != nil {
+		logger.Fatal(err)
+	}
+	logger.Info("Application stopped successfully.")
+}
+
+// Bind is a function which starts an application, and binds it to serving.
+type Bind func(p *Params, b *Bindings) error
+
+// Params are inputs to starting an application.
+type Params struct {
+	config      config.View
+	serviceName string
+}
+
+// Config provides the configuration for the application.
+func (p *Params) Config() config.View {
+	return p.config
+}
+
+// ServiceName is a name for the currently running binary specified by
+// RunApplication.
+func (p *Params) ServiceName() string {
+	return p.serviceName
+}
+
+// Bindings allows applications to bind various functions to the running servers.
+type Bindings struct {
+	sp       *rpc.ServerParams
+	a        *App
+	firstErr error
+}
+
+// AddHealthCheckFunc allows an application to check if it is healthy, and
+// contribute to the overall server health.
+func (b *Bindings) AddHealthCheckFunc(f func(context.Context) error) {
+	b.sp.AddHealthCheckFunc(f)
+}
+
+// RegisterViews begins collecting data for the given views.
+func (b *Bindings) RegisterViews(v ...*view.View) {
+	if err := view.Register(v...); err != nil {
+		if b.firstErr == nil {
+			b.firstErr = err
+		}
+		return
+	}
+
+	b.AddCloser(func() {
+		view.Unregister(v...)
+	})
+}
+
+// AddHandleFunc adds a protobuf service to the grpc server which is starting.
+func (b *Bindings) AddHandleFunc(handlerFunc rpc.GrpcHandler, grpcProxyHandler rpc.GrpcProxyHandler) {
+	b.sp.AddHandleFunc(handlerFunc, grpcProxyHandler)
+}
+
+// TelemetryHandle adds a handler to the mux for serving debug info and metrics.
+func (b *Bindings) TelemetryHandle(pattern string, handler http.Handler) {
+	b.sp.ServeMux.Handle(pattern, handler)
+}
+
+// TelemetryHandleFunc adds a handlerfunc to the mux for serving debug info and metrics.
+func (b *Bindings) TelemetryHandleFunc(pattern string, handler func(http.ResponseWriter, *http.Request)) {
+	b.sp.ServeMux.HandleFunc(pattern, handler)
+}
+
+// AddCloser specifies a function to be called when the application is being
+// stopped.  Closers are called in reverse order.
+func (b *Bindings) AddCloser(c func()) {
+	b.a.closers = append(b.a.closers, func() error {
+		c()
+		return nil
+	})
+}
+
+// AddCloserErr specifies a function to be called when the application is being
+// stopped.  Closers are called in reverse order.  The first error returned by
+// a closer will be logged.
+func (b *Bindings) AddCloserErr(c func() error) {
+	b.a.closers = append(b.a.closers, c)
+}
+
+// App is used internally, and public only for apptest.  Do not use, and use apptest instead.
+type App struct {
+	closers []func() error
+}
+
+// NewApplication is used internally, and public only for apptest.  Do not use, and use apptest instead.
+func NewApplication(serviceName string, bindService Bind, getCfg func() (config.View, error), listen func(network, address string) (net.Listener, error)) (*App, error) {
+	a := &App{}
+
+	cfg, err := getCfg()
+	if err != nil {
+		logger.WithFields(logrus.Fields{
+			"error": err.Error(),
+		}).Fatalf("cannot read configuration.")
+	}
+	logging.ConfigureLogging(cfg)
+	sp, err := rpc.NewServerParamsFromConfig(cfg, "api."+serviceName, listen)
+	if err != nil {
+		logger.WithFields(logrus.Fields{
+			"error": err.Error(),
+		}).Fatalf("cannot construct server.")
+	}
+
+	p := &Params{
+		config:      cfg,
+		serviceName: serviceName,
+	}
+	b := &Bindings{
+		a:  a,
+		sp: sp,
+	}
+
+	err = telemetry.Setup(p, b)
+	if err != nil {
+		surpressedErr := a.Stop() // Don't care about additional errors stopping.
+		_ = surpressedErr
+		return nil, err
+	}
+
+	err = bindService(p, b)
+	if err != nil {
+		surpressedErr := a.Stop() // Don't care about additional errors stopping.
+		_ = surpressedErr
+		return nil, err
+	}
+	if b.firstErr != nil {
+		surpressedErr := a.Stop() // Don't care about additional errors stopping.
+		_ = surpressedErr
+		return nil, b.firstErr
+	}
+
+	s := &rpc.Server{}
+	err = s.Start(sp)
+	if err != nil {
+		surpressedErr := a.Stop() // Don't care about additional errors stopping.
+		_ = surpressedErr
+		return nil, err
+	}
+	b.AddCloserErr(s.Stop)
+
+	return a, nil
+}
+
+// Stop is used internally, and public only for apptest.  Do not use, and use apptest instead.
+func (a *App) Stop() error {
+	// Use closers in reverse order: Since dependencies are created before
+	// their dependants, this helps ensure no dependencies are closed
+	// unexpectedly.
+	var firstErr error
+	for i := len(a.closers) - 1; i >= 0; i-- {
+		err := a.closers[i]()
+		if firstErr == nil {
+			firstErr = err
+		}
+	}
+	return firstErr
+}
--- a/internal/appmain/apptest/apptest.go
+++ b/internal/appmain/apptest/apptest.go
@ -0,0 +1,156 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package apptest allows testing of binded services within memory.
+package apptest
+
+import (
+	"net"
+	"testing"
+
+	"github.com/pkg/errors"
+	"google.golang.org/grpc"
+	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/rpc"
+)
+
+// ServiceName is a constant used for all in memory tests.
+const ServiceName = "test"
+
+// TestApp starts an application for testing.  It will automatically stop after
+// the test completes, and immediately fail the test if there is an error
+// starting.  The caller must provide the listers to use for the app, this way
+// the listeners can use a random port, and set the proper values on the config.
+func TestApp(t *testing.T, cfg config.View, listeners []net.Listener, binds ...appmain.Bind) {
+	ls, err := newListenerStorage(listeners)
+	if err != nil {
+		t.Fatal(err)
+	}
+	getCfg := func() (config.View, error) {
+		return cfg, nil
+	}
+
+	app, err := appmain.NewApplication(ServiceName, bindAll(binds), getCfg, ls.listen)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() {
+		err := app.Stop()
+		if err != nil {
+			t.Fatal(err)
+		}
+	})
+}
+
+// RunInCluster allows for running services during an in cluster e2e test.
+// This is NOT for running the actual code under test, but instead allow running
+// auxiliary services the code under test might call.
+func RunInCluster(binds ...appmain.Bind) (func() error, error) {
+	readConfig := func() (config.View, error) {
+		return config.Read()
+	}
+
+	app, err := appmain.NewApplication(ServiceName, bindAll(binds), readConfig, net.Listen)
+	if err != nil {
+		return nil, err
+	}
+	return app.Stop, nil
+}
+
+func bindAll(binds []appmain.Bind) appmain.Bind {
+	return func(p *appmain.Params, b *appmain.Bindings) error {
+		for _, bind := range binds {
+			bindErr := bind(p, b)
+			if bindErr != nil {
+				return bindErr
+			}
+		}
+		return nil
+	}
+}
+
+func newFullAddr(network, address string) (fullAddr, error) {
+	a := fullAddr{
+		network: network,
+	}
+	var err error
+	a.host, a.port, err = net.SplitHostPort(address)
+	if err != nil {
+		return fullAddr{}, err
+	}
+	// Usually listeners are started with an "unspecified" ip address, which has
+	// several equivalent forms: ":80", "0.0.0.0:80", "[::]:80".  Even if the
+	// callers use the same form, the listeners may return a different form when
+	// asked for its address.  So detect and revert to the simpler form.
+	if net.ParseIP(a.host).IsUnspecified() {
+		a.host = ""
+	}
+	return a, nil
+}
+
+type fullAddr struct {
+	network string
+	host    string
+	port    string
+}
+
+type listenerStorage struct {
+	l map[fullAddr]net.Listener
+}
+
+func newListenerStorage(listeners []net.Listener) (*listenerStorage, error) {
+	ls := &listenerStorage{
+		l: make(map[fullAddr]net.Listener),
+	}
+	for _, l := range listeners {
+		a, err := newFullAddr(l.Addr().Network(), l.Addr().String())
+		if err != nil {
+			return nil, err
+		}
+		ls.l[a] = l
+	}
+	return ls, nil
+}
+
+func (ls *listenerStorage) listen(network, address string) (net.Listener, error) {
+	a, err := newFullAddr(network, address)
+	if err != nil {
+		return nil, err
+	}
+
+	l, ok := ls.l[a]
+	if !ok {
+		return nil, errors.Errorf("Listener for \"%s\" was not passed to TestApp or was already used", address)
+	}
+	delete(ls.l, a)
+	return l, nil
+}
+
+// GRPCClient creates a new client which connects to the specified service. It
+// immediately fails the test if there is an error, and will also automatically
+// close after the test completes.
+func GRPCClient(t *testing.T, cfg config.View, service string) *grpc.ClientConn {
+	conn, err := rpc.GRPCClientFromConfig(cfg, service)
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() {
+		err := conn.Close()
+		if err != nil {
+			t.Fatal(err)
+		}
+	})
+	return conn
+}
--- a/internal/appmain/contextcause/contextcause.go
+++ b/internal/appmain/contextcause/contextcause.go
@ -0,0 +1,62 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package contextcause
+
+import (
+	"context"
+	"sync"
+)
+
+// WithCancelCause returns a copy of parent with a new Done channel. The
+// returned context's Done channel is closed when the returned cancel function
+// is called or when the parent context's Done channel is closed, whichever
+// happens first.  Unlike the conext package's WithCancel, the cancel func takes
+// an error, and will return that error on subsequent calls to Err().
+func WithCancelCause(parent context.Context) (context.Context, CancelErrFunc) {
+	parent, cancel := context.WithCancel(parent)
+
+	ctx := &contextWithCancelCause{
+		Context: parent,
+	}
+
+	return ctx, func(err error) {
+		ctx.m.Lock()
+		defer ctx.m.Unlock()
+
+		if ctx.err == nil && parent.Err() == nil {
+			ctx.err = err
+		}
+		cancel()
+	}
+}
+
+// CancelErrFunc cancels a context simular to context.CancelFunc.  However it
+// indicates why the context was canceled with the provided error.
+type CancelErrFunc func(err error)
+
+type contextWithCancelCause struct {
+	context.Context
+	m   sync.Mutex
+	err error
+}
+
+func (ctx *contextWithCancelCause) Err() error {
+	ctx.m.Lock()
+	defer ctx.m.Unlock()
+	if ctx.err == nil {
+		return ctx.Context.Err()
+	}
+	return ctx.err
+}
--- a/internal/appmain/contextcause/contextcause_test.go
+++ b/internal/appmain/contextcause/contextcause_test.go
@ -0,0 +1,64 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package contextcause
+
+import (
+	"context"
+	"testing"
+
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/require"
+)
+
+var errExample = errors.New("errExample")
+
+func TestCauseOverride(t *testing.T) {
+	parent, cancelParent := context.WithCancel(context.Background())
+	ctx, cancel := WithCancelCause(parent)
+
+	select {
+	case <-ctx.Done():
+		t.FailNow()
+	default:
+	}
+
+	cancel(errExample)
+	<-ctx.Done()
+	require.Equal(t, errExample, ctx.Err())
+
+	cancel(errors.New("second error"))
+	require.Equal(t, errExample, ctx.Err())
+
+	cancelParent()
+	require.Equal(t, errExample, ctx.Err())
+}
+
+func TestParentCanceledFirst(t *testing.T) {
+	parent, cancelParent := context.WithCancel(context.Background())
+	ctx, cancel := WithCancelCause(parent)
+
+	select {
+	case <-ctx.Done():
+		t.FailNow()
+	default:
+	}
+
+	cancelParent()
+	<-ctx.Done()
+	require.Equal(t, context.Canceled, ctx.Err())
+
+	cancel(errExample)
+	require.Equal(t, context.Canceled, ctx.Err())
+}
--- a/internal/config/config.go
+++ b/internal/config/config.go
@ -24,7 +24,7 @@ import (
 )

 // Read sets default to a viper instance and read user config to override these defaults.
-func Read() (View, error) {
+func Read() (*viper.Viper, error) {
 	var err error
 	// read configs from config/default/matchmaker_config_default.yaml
 	// matchmaker_config_default provides default values for all of the possible tunnable parameters in Open Match
--- a/internal/filter/filter_test.go
+++ b/internal/filter/filter_test.go
@ -19,7 +19,7 @@ import (

 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/timestamp"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"open-match.dev/open-match/internal/filter/testcases"
@ -31,9 +31,10 @@ func TestMeetsCriteria(t *testing.T) {
 		tc := tc
 		t.Run(tc.Name, func(t *testing.T) {
 			pf, err := NewPoolFilter(tc.Pool)
-			if err != nil {
-				t.Error("pool should be valid")
-			}
+
+			require.NoError(t, err)
+			require.NotNil(t, pf)
+
 			tc.Ticket.CreateTime = ptypes.TimestampNow()
 			if !pf.In(tc.Ticket) {
 				t.Error("ticket should be included in the pool")
@ -45,9 +46,10 @@ func TestMeetsCriteria(t *testing.T) {
 		tc := tc
 		t.Run(tc.Name, func(t *testing.T) {
 			pf, err := NewPoolFilter(tc.Pool)
-			if err != nil {
-				t.Error("pool should be valid")
-			}
+
+			require.NoError(t, err)
+			require.NotNil(t, pf)
+
 			tc.Ticket.CreateTime = ptypes.TimestampNow()
 			if pf.In(tc.Ticket) {
 				t.Error("ticket should be excluded from the pool")
@ -83,10 +85,13 @@ func TestValidPoolFilter(t *testing.T) {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			pf, err := NewPoolFilter(tc.pool)
-			assert.Nil(t, pf)
+
+			require.Error(t, err)
+			require.Nil(t, pf)
+
 			s := status.Convert(err)
-			assert.Equal(t, tc.code, s.Code())
-			assert.Equal(t, tc.msg, s.Message())
+			require.Equal(t, tc.code, s.Code())
+			require.Equal(t, tc.msg, s.Message())
 		})
 	}
 }
--- a/internal/logging/logging_test.go
+++ b/internal/logging/logging_test.go
@ -21,7 +21,7 @@ import (

 	stackdriver "github.com/TV4/logrus-stackdriver-formatter"
 	"github.com/sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )

 func TestNewFormatter(t *testing.T) {
@ -37,9 +37,9 @@ func TestNewFormatter(t *testing.T) {
 	for _, tc := range testCases {
 		tc := tc
 		t.Run(fmt.Sprintf("newFormatter(%s) => %s", tc.in, tc.expected), func(t *testing.T) {
-			assert := assert.New(t)
+			require := require.New(t)
 			actual := newFormatter(tc.in)
-			assert.Equal(reflect.TypeOf(tc.expected), reflect.TypeOf(actual))
+			require.Equal(reflect.TypeOf(tc.expected), reflect.TypeOf(actual))
 		})
 	}
 }
@ -60,9 +60,9 @@ func TestIsDebugLevel(t *testing.T) {
 	for _, tc := range testCases {
 		tc := tc
 		t.Run(fmt.Sprintf("isDebugLevel(%s) => %t", tc.in, tc.expected), func(t *testing.T) {
-			assert := assert.New(t)
+			require := require.New(t)
 			actual := isDebugLevel(tc.in)
-			assert.Equal(tc.expected, actual)
+			require.Equal(tc.expected, actual)
 		})
 	}
 }
@ -87,9 +87,9 @@ func TestToLevel(t *testing.T) {
 	for _, tc := range testCases {
 		tc := tc
 		t.Run(fmt.Sprintf("toLevel(%s) => %s", tc.in, tc.expected), func(t *testing.T) {
-			assert := assert.New(t)
+			require := require.New(t)
 			actual := toLevel(tc.in)
-			assert.Equal(tc.expected, actual)
+			require.Equal(tc.expected, actual)
 		})
 	}
 }
--- a/internal/rpc/clientcache_test.go
+++ b/internal/rpc/clientcache_test.go
@ -18,7 +18,7 @@ import (
 	"testing"

 	"github.com/spf13/viper"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )

 const (
@ -27,31 +27,31 @@ const (
 )

 func TestGetGRPC(t *testing.T) {
-	assert := assert.New(t)
+	require := require.New(t)

 	cc := NewClientCache(viper.New())
 	client, err := cc.GetGRPC(fakeGRPCAddress)
-	assert.Nil(err)
+	require.Nil(err)

 	cachedClient, err := cc.GetGRPC(fakeGRPCAddress)
-	assert.Nil(err)
+	require.Nil(err)

 	// Test caching by comparing pointer value
-	assert.EqualValues(client, cachedClient)
+	require.EqualValues(client, cachedClient)
 }

 func TestGetHTTP(t *testing.T) {
-	assert := assert.New(t)
+	require := require.New(t)

 	cc := NewClientCache(viper.New())
 	client, address, err := cc.GetHTTP(fakeHTTPAddress)
-	assert.Nil(err)
-	assert.Equal(fakeHTTPAddress, address)
+	require.Nil(err)
+	require.Equal(fakeHTTPAddress, address)

 	cachedClient, address, err := cc.GetHTTP(fakeHTTPAddress)
-	assert.Nil(err)
-	assert.Equal(fakeHTTPAddress, address)
+	require.Nil(err)
+	require.Equal(fakeHTTPAddress, address)

 	// Test caching by comparing pointer value
-	assert.EqualValues(client, cachedClient)
+	require.EqualValues(client, cachedClient)
 }
--- a/internal/rpc/clients_test.go
+++ b/internal/rpc/clients_test.go
@ -17,12 +17,13 @@ package rpc
 import (
 	"fmt"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"os"
 	"testing"

 	"github.com/spf13/viper"
-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/telemetry"
@ -33,39 +34,39 @@ import (
 )

 func TestSecureGRPCFromConfig(t *testing.T) {
-	assert := assert.New(t)
+	require := require.New(t)

-	cfg, rpcParams, closer := configureConfigAndKeysForTesting(assert, true)
+	cfg, rpcParams, closer := configureConfigAndKeysForTesting(t, require, true)
 	defer closer()

-	runGrpcClientTests(t, assert, cfg, rpcParams)
+	runGrpcClientTests(t, require, cfg, rpcParams)
 }

 func TestInsecureGRPCFromConfig(t *testing.T) {
-	assert := assert.New(t)
+	require := require.New(t)

-	cfg, rpcParams, closer := configureConfigAndKeysForTesting(assert, false)
+	cfg, rpcParams, closer := configureConfigAndKeysForTesting(t, require, false)
 	defer closer()

-	runGrpcClientTests(t, assert, cfg, rpcParams)
+	runGrpcClientTests(t, require, cfg, rpcParams)
 }

 func TestHTTPSFromConfig(t *testing.T) {
-	assert := assert.New(t)
+	require := require.New(t)

-	cfg, rpcParams, closer := configureConfigAndKeysForTesting(assert, true)
+	cfg, rpcParams, closer := configureConfigAndKeysForTesting(t, require, true)
 	defer closer()

-	runHTTPClientTests(assert, cfg, rpcParams)
+	runHTTPClientTests(require, cfg, rpcParams)
 }

 func TestInsecureHTTPFromConfig(t *testing.T) {
-	assert := assert.New(t)
+	require := require.New(t)

-	cfg, rpcParams, closer := configureConfigAndKeysForTesting(assert, false)
+	cfg, rpcParams, closer := configureConfigAndKeysForTesting(t, require, false)
 	defer closer()

-	runHTTPClientTests(assert, cfg, rpcParams)
+	runHTTPClientTests(require, cfg, rpcParams)
 }

 func TestSanitizeHTTPAddress(t *testing.T) {
@ -87,15 +88,15 @@ func TestSanitizeHTTPAddress(t *testing.T) {
 		tc := testCase
 		description := fmt.Sprintf("sanitizeHTTPAddress(%s, %t) => (%s, %v)", tc.address, tc.preferHTTPS, tc.expected, tc.err)
 		t.Run(description, func(t *testing.T) {
-			assert := assert.New(t)
+			require := require.New(t)
 			actual, err := sanitizeHTTPAddress(tc.address, tc.preferHTTPS)
-			assert.Equal(tc.expected, actual)
-			assert.Equal(tc.err, err)
+			require.Equal(tc.expected, actual)
+			require.Equal(tc.err, err)
 		})
 	}
 }

-func runGrpcClientTests(t *testing.T, assert *assert.Assertions, cfg config.View, rpcParams *ServerParams) {
+func runGrpcClientTests(t *testing.T, require *require.Assertions, cfg config.View, rpcParams *ServerParams) {
 	// Serve a fake frontend server and wait for its full start up
 	ff := &shellTesting.FakeFrontend{}
 	rpcParams.AddHandleFunc(func(s *grpc.Server) {
@ -104,24 +105,23 @@ func runGrpcClientTests(t *testing.T, assert *assert.Assertions, cfg config.View

 	s := &Server{}
 	defer s.Stop()
-	waitForStart, err := s.Start(rpcParams)
-	assert.Nil(err)
-	waitForStart()
+	err := s.Start(rpcParams)
+	require.Nil(err)

 	// Acquire grpc client
 	grpcConn, err := GRPCClientFromConfig(cfg, "test")
-	assert.Nil(err)
-	assert.NotNil(grpcConn)
+	require.Nil(err)
+	require.NotNil(grpcConn)

 	// Confirm the client works as expected
 	ctx := utilTesting.NewContext(t)
 	feClient := pb.NewFrontendServiceClient(grpcConn)
 	grpcResp, err := feClient.CreateTicket(ctx, &pb.CreateTicketRequest{})
-	assert.Nil(err)
-	assert.NotNil(grpcResp)
+	require.Nil(err)
+	require.NotNil(grpcResp)
 }

-func runHTTPClientTests(assert *assert.Assertions, cfg config.View, rpcParams *ServerParams) {
+func runHTTPClientTests(require *require.Assertions, cfg config.View, rpcParams *ServerParams) {
 	// Serve a fake frontend server and wait for its full start up
 	ff := &shellTesting.FakeFrontend{}
 	rpcParams.AddHandleFunc(func(s *grpc.Server) {
@ -129,22 +129,21 @@ func runHTTPClientTests(assert *assert.Assertions, cfg config.View, rpcParams *S
 	}, pb.RegisterFrontendServiceHandlerFromEndpoint)
 	s := &Server{}
 	defer s.Stop()
-	waitForStart, err := s.Start(rpcParams)
-	assert.Nil(err)
-	waitForStart()
+	err := s.Start(rpcParams)
+	require.Nil(err)

 	// Acquire http client
 	httpClient, baseURL, err := HTTPClientFromConfig(cfg, "test")
-	assert.Nil(err)
+	require.Nil(err)

 	// Confirm the client works as expected
 	httpReq, err := http.NewRequest(http.MethodGet, baseURL+telemetry.HealthCheckEndpoint, nil)
-	assert.Nil(err)
-	assert.NotNil(httpReq)
+	require.Nil(err)
+	require.NotNil(httpReq)

 	httpResp, err := httpClient.Do(httpReq)
-	assert.Nil(err)
-	assert.NotNil(httpResp)
+	require.Nil(err)
+	require.NotNil(httpResp)
 	defer func() {
 		if httpResp != nil {
 			httpResp.Body.Close()
@ -152,39 +151,39 @@ func runHTTPClientTests(assert *assert.Assertions, cfg config.View, rpcParams *S
 	}()

 	body, err := ioutil.ReadAll(httpResp.Body)
-	assert.Nil(err)
-	assert.Equal(200, httpResp.StatusCode)
-	assert.Equal("ok", string(body))
+	require.Nil(err)
+	require.Equal(200, httpResp.StatusCode)
+	require.Equal("ok", string(body))
 }

 // Generate a config view and optional TLS key manifests (optional) for testing
-func configureConfigAndKeysForTesting(assert *assert.Assertions, tlsEnabled bool) (config.View, *ServerParams, func()) {
+func configureConfigAndKeysForTesting(t *testing.T, require *require.Assertions, tlsEnabled bool) (config.View, *ServerParams, func()) {
 	// Create netlisteners on random ports used for rpc serving
-	grpcLh := MustListen()
-	httpLh := MustListen()
-	rpcParams := NewServerParamsFromListeners(grpcLh, httpLh)
+	grpcL := MustListen()
+	httpL := MustListen()
+	rpcParams := NewServerParamsFromListeners(grpcL, httpL)

 	// Generate a config view with paths to the manifests
 	cfg := viper.New()
 	cfg.Set("test.hostname", "localhost")
-	cfg.Set("test.grpcport", grpcLh.Number())
-	cfg.Set("test.httpport", httpLh.Number())
+	cfg.Set("test.grpcport", MustGetPortNumber(grpcL))
+	cfg.Set("test.httpport", MustGetPortNumber(httpL))

 	// Create temporary TLS key files for testing
 	pubFile, err := ioutil.TempFile("", "pub*")
-	assert.Nil(err)
+	require.Nil(err)

 	if tlsEnabled {
 		// Generate public and private key bytes
 		pubBytes, priBytes, err := certgenTesting.CreateCertificateAndPrivateKeyForTesting([]string{
-			fmt.Sprintf("localhost:%d", grpcLh.Number()),
-			fmt.Sprintf("localhost:%d", httpLh.Number()),
+			fmt.Sprintf("localhost:%s", MustGetPortNumber(grpcL)),
+			fmt.Sprintf("localhost:%s", MustGetPortNumber(httpL)),
 		})
-		assert.Nil(err)
+		require.Nil(err)

 		// Write certgen key bytes to the temp files
 		err = ioutil.WriteFile(pubFile.Name(), pubBytes, 0400)
-		assert.Nil(err)
+		require.Nil(err)

 		// Generate a config view with paths to the manifests
 		cfg.Set(configNameClientTrustedCertificatePath, pubFile.Name())
@ -192,12 +191,30 @@ func configureConfigAndKeysForTesting(assert *assert.Assertions, tlsEnabled bool
 		rpcParams.SetTLSConfiguration(pubBytes, pubBytes, priBytes)
 	}

-	return cfg, rpcParams, func() { removeTempFile(assert, pubFile.Name()) }
+	return cfg, rpcParams, func() { removeTempFile(t, pubFile.Name()) }
 }

-func removeTempFile(assert *assert.Assertions, paths ...string) {
+func MustListen() net.Listener {
+	l, err := net.Listen("tcp", ":0")
+	if err != nil {
+		panic(err)
+	}
+	return l
+}
+
+func MustGetPortNumber(l net.Listener) string {
+	_, port, err := net.SplitHostPort(l.Addr().String())
+	if err != nil {
+		panic(err)
+	}
+	return port
+}
+
+func removeTempFile(t *testing.T, paths ...string) {
 	for _, path := range paths {
 		err := os.Remove(path)
-		assert.Nil(err)
+		if err != nil {
+			t.Errorf("Can not remove the temporary file: %s, err: %s", path, err.Error())
+		}
 	}
 }
--- a/internal/rpc/insecure.go
+++ b/internal/rpc/insecure.go
@ -16,10 +16,8 @@ package rpc

 import (
 	"context"
-	"net/http"
-	"sync"
-
 	"net"
+	"net/http"

 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/pkg/errors"
@ -28,40 +26,28 @@ import (
 )

 type insecureServer struct {
-	grpcLh       *ListenerHolder
 	grpcListener net.Listener
 	grpcServer   *grpc.Server

-	httpLh       *ListenerHolder
 	httpListener net.Listener
 	httpMux      *http.ServeMux
 	proxyMux     *runtime.ServeMux
 	httpServer   *http.Server
 }

-func (s *insecureServer) start(params *ServerParams) (func(), error) {
-	var serverStartWaiter sync.WaitGroup
-
+func (s *insecureServer) start(params *ServerParams) error {
 	s.httpMux = params.ServeMux
 	s.proxyMux = runtime.NewServeMux()

 	// Configure the gRPC server.
-	grpcListener, err := s.grpcLh.Obtain()
-	if err != nil {
-		return func() {}, errors.WithStack(err)
-	}
-	s.grpcListener = grpcListener
-
 	s.grpcServer = grpc.NewServer(newGRPCServerOptions(params)...)
 	// Bind gRPC handlers
 	for _, handlerFunc := range params.handlersForGrpc {
 		handlerFunc(s.grpcServer)
 	}

-	serverStartWaiter.Add(1)
 	go func() {
-		serverStartWaiter.Done()
-		serverLogger.Infof("Serving gRPC: %s", s.grpcLh.AddrString())
+		serverLogger.Infof("Serving gRPC: %s", s.grpcListener.Addr().String())
 		gErr := s.grpcServer.Serve(s.grpcListener)
 		if gErr != nil {
 			return
@ -69,21 +55,15 @@ func (s *insecureServer) start(params *ServerParams) (func(), error) {
 	}()

 	// Configure the HTTP proxy server.
-	httpListener, err := s.httpLh.Obtain()
-	if err != nil {
-		return func() {}, errors.WithStack(err)
-	}
-	s.httpListener = httpListener
-
 	// Bind gRPC handlers
 	ctx, cancel := context.WithCancel(context.Background())

 	for _, handlerFunc := range params.handlersForGrpcProxy {
 		dialOpts := newGRPCDialOptions(params.enableMetrics, params.enableRPCLogging, params.enableRPCPayloadLogging)
 		dialOpts = append(dialOpts, grpc.WithInsecure())
-		if err = handlerFunc(ctx, s.proxyMux, grpcListener.Addr().String(), dialOpts); err != nil {
+		if err := handlerFunc(ctx, s.proxyMux, s.grpcListener.Addr().String(), dialOpts); err != nil {
 			cancel()
-			return func() {}, errors.WithStack(err)
+			return errors.WithStack(err)
 		}
 	}

@ -93,38 +73,28 @@ func (s *insecureServer) start(params *ServerParams) (func(), error) {
 		Addr:    s.httpListener.Addr().String(),
 		Handler: instrumentHTTPHandler(s.httpMux, params),
 	}
-	serverStartWaiter.Add(1)
 	go func() {
-		serverStartWaiter.Done()
-		serverLogger.Infof("Serving HTTP: %s", s.httpLh.AddrString())
+		serverLogger.Infof("Serving HTTP: %s", s.httpListener.Addr().String())
 		hErr := s.httpServer.Serve(s.httpListener)
 		defer cancel()
-		if hErr != nil {
-			serverLogger.Debugf("error closing gRPC server: %s", hErr)
+		if hErr != nil && hErr != http.ErrServerClosed {
+			serverLogger.Debugf("error serving HTTP: %s", hErr)
 		}
 	}()

-	return serverStartWaiter.Wait, nil
+	return nil
 }

-func (s *insecureServer) stop() {
-	s.grpcServer.Stop()
-	if err := s.grpcListener.Close(); err != nil {
-		serverLogger.Debugf("error closing gRPC listener: %s", err)
-	}
-
-	if err := s.httpServer.Close(); err != nil {
-		serverLogger.Debugf("error closing HTTP server: %s", err)
-	}
-
-	if err := s.httpListener.Close(); err != nil {
-		serverLogger.Debugf("error closing HTTP listener: %s", err)
-	}
+func (s *insecureServer) stop() error {
+	// the servers also close their respective listeners.
+	err := s.httpServer.Shutdown(context.Background())
+	s.grpcServer.GracefulStop()
+	return err
 }

-func newInsecureServer(grpcLh *ListenerHolder, httpLh *ListenerHolder) *insecureServer {
+func newInsecureServer(grpcL, httpL net.Listener) *insecureServer {
 	return &insecureServer{
-		grpcLh: grpcLh,
-		httpLh: httpLh,
+		grpcListener: grpcL,
+		httpListener: httpL,
 	}
 }
--- a/internal/rpc/insecure_test.go
+++ b/internal/rpc/insecure_test.go
@ -22,34 +22,33 @@ import (

 	"open-match.dev/open-match/pkg/pb"

-	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	shellTesting "open-match.dev/open-match/internal/testing"
 )

 func TestInsecureStartStop(t *testing.T) {
-	assert := assert.New(t)
-	grpcLh := MustListen()
-	httpLh := MustListen()
+	require := require.New(t)
+	grpcL := MustListen()
+	httpL := MustListen()
 	ff := &shellTesting.FakeFrontend{}

-	params := NewServerParamsFromListeners(grpcLh, httpLh)
+	params := NewServerParamsFromListeners(grpcL, httpL)
 	params.AddHandleFunc(func(s *grpc.Server) {
 		pb.RegisterFrontendServiceServer(s, ff)
 	}, pb.RegisterFrontendServiceHandlerFromEndpoint)
-	s := newInsecureServer(grpcLh, httpLh)
+	s := newInsecureServer(grpcL, httpL)
 	defer s.stop()
-	waitForStart, err := s.start(params)
-	assert.Nil(err)
-	waitForStart()
+	err := s.start(params)
+	require.Nil(err)

-	conn, err := grpc.Dial(fmt.Sprintf(":%d", grpcLh.Number()), grpc.WithInsecure())
-	assert.Nil(err)
+	conn, err := grpc.Dial(fmt.Sprintf(":%s", MustGetPortNumber(grpcL)), grpc.WithInsecure())
+	require.Nil(err)
 	defer conn.Close()

-	endpoint := fmt.Sprintf("http://localhost:%d", httpLh.Number())
+	endpoint := fmt.Sprintf("http://localhost:%s", MustGetPortNumber(httpL))
 	httpClient := &http.Client{
 		Timeout: time.Second,
 	}
-	runGrpcWithProxyTests(t, assert, s, conn, httpClient, endpoint)
+	runGrpcWithProxyTests(t, require, s, conn, httpClient, endpoint)
 }
--- a/internal/rpc/listener_holder.go
+++ b/internal/rpc/listener_holder.go
@ -1,106 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rpc
-
-import (
-	"fmt"
-	"net"
-
-	"sync"
-
-	"github.com/pkg/errors"
-)
-
-// ListenerHolder holds an opened port that can only be handed off to 1 go routine.
-type ListenerHolder struct {
-	number   int
-	listener net.Listener
-	addr     string
-	sync.RWMutex
-}
-
-// Obtain returns the TCP listener. This method can only be called once and is thread-safe.
-func (lh *ListenerHolder) Obtain() (net.Listener, error) {
-	lh.Lock()
-	defer lh.Unlock()
-	listener := lh.listener
-	lh.listener = nil
-	if listener == nil {
-		return nil, errors.WithStack(fmt.Errorf("cannot Obtain() listener for %d because already handed off", lh.number))
-	}
-	return listener, nil
-}
-
-// Number returns the port number.
-func (lh *ListenerHolder) Number() int {
-	return lh.number
-}
-
-// AddrString returns the address of the serving port.
-// Use this over fmt.Sprintf(":%d", lh.Number()) because the address is represented differently in
-// systems that prefer IPv4 and IPv6.
-func (lh *ListenerHolder) AddrString() string {
-	return lh.addr
-}
-
-// Close shutsdown the TCP listener.
-func (lh *ListenerHolder) Close() error {
-	lh.Lock()
-	defer lh.Unlock()
-	if lh.listener != nil {
-		err := lh.listener.Close()
-		lh.listener = nil
-		return err
-	}
-	return nil
-}
-
-// newFromPortNumber opens a TCP listener based on the port number provided.
-func newFromPortNumber(portNumber int) (*ListenerHolder, error) {
-	addr := ""
-	// port 0 actually means random port which should only be used in tests.
-	if portNumber == 0 {
-		// Only accept connections from localhost in test mode.
-		addr = fmt.Sprintf("localhost:%d", portNumber)
-	} else {
-		addr = fmt.Sprintf(":%d", portNumber)
-	}
-	conn, err := net.Listen("tcp", addr)
-	if err != nil {
-		return nil, err
-	}
-
-	tcpConn, ok := conn.Addr().(*net.TCPAddr)
-	if !ok || tcpConn == nil {
-		return nil, fmt.Errorf("net.Listen(\"tcp\", %s) did not return a *net.TCPAddr", addr)
-	}
-
-	return &ListenerHolder{
-		number:   tcpConn.Port,
-		listener: conn,
-		addr:     conn.Addr().String(),
-	}, nil
-}
-
-// MustListen finds the next available port to open for TCP connections, used in tests to make them isolated.
-func MustListen() *ListenerHolder {
-	// Port 0 in Go is a special port number to randomly choose an available port.
-	// Reference, https://golang.org/pkg/net/#ListenTCP.
-	lh, err := newFromPortNumber(0)
-	if err != nil {
-		panic(err)
-	}
-	return lh
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jonfoust	c0b355da51	release-1.1.0-rc.1 (#1286 )	2020-11-18 13:42:34 -08:00
Alexey	6f05e526fb	Improved tests for statestore - redis (#1264 )	2020-10-12 19:21:51 -07:00
Alexey	496d156faa	Added unary interceptor and removed extra logs (#1255 ) * added unary interceptor and removed logs from frontend service * removed extra logs from backend serrvice * updated evaluator logging * updated query logging linter fix * fix Co-authored-by: Scott Redig <sredig@google.com>	2020-09-21 15:02:29 -07:00
Galal Hassan	3a3d618c43	Replaced GS bucket links with substitution variables (#1262 )	2020-09-21 12:22:03 -07:00
Starly Solon	e1cbd855f5	Added time to assignment metrics to backend (#1241 ) * Added time to assignment metrics to backend - The time to match for tickets is now recorded as a metric * Fixed formatting errors * Fixed minor review changes - Renamed function to calculate time to assignment - Moved from callback to returning tickets from UpdateAssignments * Return only successfully assigned tickets * Fixed linting errors	2020-09-15 11:18:17 -07:00
Alexey	10b36705f0	Tests update: use require assertion (#1257 ) * use require in filter package fix * use require in rpc package * use require in tools/certgen package * use require in mmf package * use require in telemetry and logging fix Co-authored-by: Scott Redig <sredig@google.com>	2020-09-09 14:24:18 -07:00
Alexander Apalikov	a6fc4724bc	Fix spelling in Proto files (#1256 ) Regenerated dependent Swagger and Golang files.	2020-09-09 12:20:29 -07:00
Alexey	511337088a	Reduce logging in statestore - redis (#1248 ) * reduce logging in statestore - redis #1228 fix * added grpc interceptors to log errors lint fix Co-authored-by: Scott Redig <sredig@google.com>	2020-09-02 12:50:39 -07:00
Alexey	5f67bb36a6	Use require in app tests and improve error messages (#1253 )	2020-08-31 13:17:29 -07:00
Alexey	94d2105809	Use require in tests to avoid nil pointer exceptions (#1249 ) * use require in tests to avoid nil pointer exceptions * statestore tests: replaced assert with require	2020-08-28 12:19:53 -07:00
Alexey	d85f1f4bc7	Added a PR template (#1250 )	2020-08-25 14:16:36 -07:00
Paul "TBBle" Hampson	79e9afeca7	Use Helm release to name resources (#1246 ) * Fix indent of TLS certificate annotations Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Small whitespace fixes Picked up the VSCode Yaml auto-formatter. Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Don't pass 'query' config to open-match-customize It's not used. Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Don't pass frontend/backend to open-match-scale They're not used. Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Allow redis to derive resource names from the release This ensures that multiple OpenMatch installs in a single namespace do not attempt to install Redis stacks with the same resource names. Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Include release names in PodSecurityPolicies This avoids conflicts between multiple Open Match installations in the same namespace. `openmatch.fullname` named template per Helm default chart. Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Make the Service Account name release-dependent This makes the existing global.kubernetes.serviceAccount value an override if specified, but if left unspecified, an appropriate name will be chosen. Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Make the RBAC resource names release-dependent Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Make the TLS Secret names release-dependent Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Make the CI-test resource names release-dependent Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Make all Pod/Service names release-dependent Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Make Grafana dashboard names release-dependent Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Make open-match-scale slightly more standalone This makes the hostname templates more standard in their case, because there is no need to coordinate the hostname with the superchart. This chart still uses a lot of templates from the open-match chart though, so it's not yet standalone-installable. Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Make ConfigMap default names release-dependent A specific ConfigMap can be applied in the same way it was previously, by overriding configs.default.configName and configs.override.configName, in which case it is up to the person doing the deployment to manage name conflicts. Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Use correct Jaeger service names for subcharts This fixes an existing issue where the Jaeger connection URLs in the configuration would be incorrect if your Helm chart was not installed as a release named "open-match". Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net> * Populate Grafana Datasource using a ConfigMap This allows us to access the Prometheus subchart's named template to get the correct Service name for the datasource. This fixes an existing issue where the Prometheus data source URL in Grafana would be incorrect if your Helm chart was not installed as a release named "open-match". Signed-off-by: Paul "Hampy" Hampson <p_hampson@wargaming.net>	2020-08-17 12:04:26 -07:00
Alexander Apalikov	3334f7f74a	Make: fix create-gke-cluster, create clusterRole (#1234 ) If there are multiple `gcloud auth list` accounts the command would fail, adding grep active to fix.	2020-07-10 10:57:16 -07:00
griboue	85ce954eb9	Update backend_service.go (#1233 ) Fixed typo	2020-07-09 11:45:33 -07:00
Alexander Apalikov	679cfb5839	Rename Ignore list to Pending Release (#1230 ) Fix naming across all code. Swagger changes left. Co-authored-by: Scott Redig <sredig@google.com>	2020-07-08 13:56:30 -07:00
Alexander Apalikov	c53a5b7c88	Update Swagger JSONs as well as go proto files (#1231 ) Output of run make presubmit on master. Co-authored-by: Scott Redig <sredig@google.com>	2020-07-08 12:52:51 -07:00
Alexander Apalikov	cfb316169a	Use supported GKE cluster version (#1232 ) Update Makefile.	2020-07-08 12:25:53 -07:00
Scott Redig	a9365b5333	fix release.sh not knowing the right images (#1219 )	2020-06-01 11:05:27 -07:00
Scott Redig	93df53201c	Only install ci components when running ci (#1213 )	2020-05-08 16:06:22 -07:00
Scott Redig	eb86841423	Add release all tickets API (#1215 )	2020-05-08 15:07:45 -07:00
Scott Redig	771f706317	Fix up gRPC service documentation (#1212 )	2020-05-08 14:36:41 -07:00
Scott Redig	a9f9a2f2e6	Remove alpha software warning (#1214 )	2020-05-08 13:43:54 -07:00
Scott Redig	068632285e	Give assigned tickets a time to live, default 10 minutes (#1211 )	2020-05-08 12:24:27 -07:00
Scott Redig	113461114e	Improve error message for overrunning mmfs (#1207 )	2020-05-08 11:50:48 -07:00
Scott Redig	0ac7ae13ac	Rework config value naming (#1206 )	2020-05-08 11:09:03 -07:00
yfei1	29a2dbcf99	Unified images used in helm chart and release artifacts (#1184 )	2020-05-08 10:42:16 -07:00
yfei1	48d3b5c0ee	Added Grafana dashboard of Open Match concepts (#1193 ) Dependency on #1192, resolved #1124. Added a dashboard in Matchmaking concepts, also removed the ticket dashboard. https://snapshot.raintank.io/dashboard/snapshot/GzXuMdqx554TB6XsNm3al4d6IEyJrEY3	2020-05-08 10:15:34 -07:00
Scott Redig	a5fa651106	Add grpc call options to matchfunction query functions (#1205 )	2020-05-07 18:24:38 -07:00
Scott Redig	cd84d74ff9	Fix race in e2e test (#1209 )	2020-05-07 15:15:19 -07:00
Scott Redig	8c2aa1ea81	Fix evaluator not running in mmf matchid collision test (#1210 )	2020-05-07 14:53:12 -07:00
yfei1	493ff8e520	Refactor internal telemetry package (#1192 ) This commit refactored the internal telemetry package. The pattern used in internal/app/xxx/xxx.go follows the one used in openconcensus-go. Besides adding metrics covered in #1124, this commit also introduced changes to make the telemetry settings more efficient and easier to turn on/off. In this factorization, a metric recorded can be cast into different views through different aggregation methods. Since the metric is the one that consumes most of the resources, this can make the telemetry setups more efficient than before. Also removed some metrics that were meaningful for debugging in v0.8 but are becoming useless for the current stage.	2020-05-06 18:42:20 -07:00
Scott Redig	8363bc5fc9	Refactor e2e testing and improve coverage (#1204 )	2020-05-05 20:06:32 -07:00
Scott Redig	144f646b7f	Test tutorials (#1176 )	2020-05-05 12:15:11 -07:00
Scott Redig	b518b5cc1b	Have the test instance host the mmf and evaluator (#1196 )	2020-04-23 15:02:11 -07:00
Scott Redig	af0b9fd5f7	Remove errant closing of already closed listeners (#1195 )	2020-04-23 10:24:52 -07:00
Scott Redig	5f4b522ecd	Large refactor of rpc and appmain (#1194 )	2020-04-21 14:07:09 -07:00
yfei1	12625d7f53	Moved customized configmap values to default (#1191 )	2020-04-20 15:11:13 -07:00
Scott Redig	3248c8c4ad	Refactor application binding (#1189 )	2020-04-15 11:15:49 -07:00
Scott Redig	10c0c59997	Use consistent main code for mmf and evaluator (#1185 )	2020-04-09 18:37:32 -07:00
yfei1	c17e3e62c0	Removed make all commands and pinned dependency versions (#1181 ) * Removed make all commands * oops	2020-04-03 12:01:32 -07:00
yfei1	8e91be6201	Update development.md doc (#1182 )	2020-04-02 15:50:00 -07:00
yfei1	f6c837d6cd	Removed make all commands and pinned dependency versions (#1181 ) * Removed make all commands * oops	2020-04-02 13:22:58 -07:00
yfei1	3c8908aae0	Fix create-gke-cluster version (#1179 )	2020-03-30 21:59:10 -07:00