pure-docker: deploy otel-collector by default (#849)

bobheadxi · web-flow · commit 6d8ecf323dfb · 2022-09-01T15:45:34.000-07:00
* pure-docker: deploy otel-collector, send traces via otel-collector

* prettier

* fixups
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[shellscript]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format",
+  },
 }
diff --git a/pure-docker/deploy-cadvisor.sh b/pure-docker/deploy-cadvisor.sh
@@ -31,7 +31,7 @@ sudo docker run --detach \
     --volume=/dev/disk/:/dev/disk:ro \
     --privileged \
     --device=/dev/kmsg \
-    index.docker.io/sourcegraph/cadvisor:insiders@sha256:1759a29488048e22aafc182ee4917b6a72cd0aa76d076139efba4500c6b8d167 \
+    index.docker.io/sourcegraph/cadvisor:3.43.0@sha256:91aed2aa386adf0ec6042f1c48c25bd1daff6e8b90ca155448eeeb6270b6dc05 \
     --port=8080
 
 echo "Deployed cadvisor"
diff --git a/pure-docker/deploy-codeinsights-db.sh b/pure-docker/deploy-codeinsights-db.sh
@@ -23,7 +23,7 @@ docker run --detach \
     -e POSTGRES_USER=postgres \
     -e PGDATA=/var/lib/postgresql/data/pgdata \
     -v $VOLUME:/var/lib/postgresql/data/ \
-    index.docker.io/sourcegraph/codeinsights-db:insiders@sha256:f9ec6c4ad49034945b6257355e38d402235f5a2220ca5a6ba84f154f2366c3e9
+    index.docker.io/sourcegraph/codeinsights-db:3.43.0@sha256:30cd58571358dacbaa9dba7751f3bb162999ddc9426d2abaf8ae50e0db6e4427
 
 # Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
 # but anything 12 and higher is supported.
diff --git a/pure-docker/deploy-codeintel-db.sh b/pure-docker/deploy-codeintel-db.sh
@@ -19,7 +19,7 @@ docker run --detach \
     --memory=2g \
     -e PGDATA=/var/lib/postgresql/data/pgdata \
     -v $VOLUME:/var/lib/postgresql/data/ \
-    index.docker.io/sourcegraph/codeintel-db:insiders@sha256:56eb2082c96025c83a1b3aba39dd2dfa0730f2213a4a2dba60afeb374c454da9
+    index.docker.io/sourcegraph/codeintel-db:3.43.0@sha256:deedb0b45df9b9beeebbdca33d70ee79e88818d07f9122df9cb562bb1b72a86d
 
 # Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
 # but anything 12 and higher is supported.
diff --git a/pure-docker/deploy-frontend-internal.sh b/pure-docker/deploy-frontend-internal.sh
@@ -40,6 +40,6 @@ docker run --detach \
     -e GITHUB_BASE_URL=http://github-proxy:3180 \
     -e PROMETHEUS_URL=http://prometheus:9090 \
     -v $VOLUME:/mnt/cache \
-    index.docker.io/sourcegraph/frontend:insiders@sha256:6660a1fc063bc63ba7a3f8eeca0689d5916b1b1a6c77de29ae9508e7e4d59272
+    index.docker.io/sourcegraph/frontend:3.43.0@sha256:f81f3ecf078908edcdfdc755772bac210e4bf54a014a7e1239e483c6b9674f94
 
 echo "Deployed sourcegraph-frontend-internal service"
diff --git a/pure-docker/deploy-frontend.sh b/pure-docker/deploy-frontend.sh
@@ -25,7 +25,7 @@ docker run --detach \
     --health-start-period=300s \
     -e DEPLOY_TYPE=pure-docker \
     -e GOMAXPROCS=12 \
-    -e JAEGER_AGENT_HOST=jaeger \
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
     -e PGHOST=pgsql \
     -e CODEINTEL_PGHOST=codeintel-db \
     -e CODEINSIGHTS_PGDATASOURCE=postgres://postgres:password@codeinsights-db:5432/postgres \
@@ -42,7 +42,7 @@ docker run --detach \
     -e PROMETHEUS_URL=http://prometheus:9090 \
     -v $VOLUME:/mnt/cache \
     -p 0.0.0.0:$((3080 + $1)):3080 \
-    index.docker.io/sourcegraph/frontend:insiders@sha256:6660a1fc063bc63ba7a3f8eeca0689d5916b1b1a6c77de29ae9508e7e4d59272
+    index.docker.io/sourcegraph/frontend:3.43.0@sha256:f81f3ecf078908edcdfdc755772bac210e4bf54a014a7e1239e483c6b9674f94
 
 # Note: SRC_GIT_SERVERS, SEARCHER_URL, and SYMBOLS_URL are space-separated
 # lists which each allow you to specify more container instances for scaling
diff --git a/pure-docker/deploy-github-proxy.sh b/pure-docker/deploy-github-proxy.sh
@@ -20,7 +20,7 @@ docker run --detach \
     --memory=1g \
     -e GOMAXPROCS=1 \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-    -e JAEGER_AGENT_HOST=jaeger \
-    index.docker.io/sourcegraph/github-proxy:insiders@sha256:446aa7b5552c80d13077cd1fbf111b74499dbdfc4ac38ade24a6ca8d8999f2fd
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
+    index.docker.io/sourcegraph/github-proxy:3.43.0@sha256:9ff040ddb1aebed1fcecfc257bfd5b1a4466f30db4986e7702c3075e6d910946
 
 echo "Deployed github-proxy service"
diff --git a/pure-docker/deploy-gitserver.sh b/pure-docker/deploy-gitserver.sh
@@ -21,8 +21,8 @@ docker run --detach \
     --hostname=gitserver-$1 \
     -e GOMAXPROCS=4 \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-    -e JAEGER_AGENT_HOST=jaeger \
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
     -v $VOLUME:/data/repos \
-    index.docker.io/sourcegraph/gitserver:insiders@sha256:04dc254072efc2997e75c2003e5c56e19d03d96d37b7a68de7fd03fee9b83341
+    index.docker.io/sourcegraph/gitserver:3.43.0@sha256:b3192b3fdc59fccc80c9d3e6bb2be38c0ca1474281fce09e89f664d07aa8f2ae
 
 echo "Deployed gitserver $1 service"
diff --git a/pure-docker/deploy-grafana.sh b/pure-docker/deploy-grafana.sh
@@ -21,7 +21,7 @@ docker run --detach \
     -v $VOLUME:/var/lib/grafana \
     -v $(pwd)/../grafana/datasources:/sg_config_grafana/provisioning/datasources \
     -v $(pwd)/../grafana/dashboards:/sg_grafana_additional_dashboards \
-    index.docker.io/sourcegraph/grafana:insiders@sha256:00064d24e19e1159dd70d12bc328db64e8c45fb53062b9b0e3db93984371836d
+    index.docker.io/sourcegraph/grafana:3.43.0@sha256:5510222f06238fb110900f44f0bb92f2d0fd9d02b1191e11bc132ee644ce9c75
 
 # Add the following lines above if you wish to use an auth proxy with Grafana:
 #
diff --git a/pure-docker/deploy-jaeger.sh b/pure-docker/deploy-jaeger.sh
@@ -20,5 +20,5 @@ docker run --detach \
     -p 0.0.0.0:5778:5778 \
     -p 0.0.0.0:6831:6831 \
     -p 0.0.0.0:6832:6832 \
-    index.docker.io/sourcegraph/jaeger-all-in-one:insiders@sha256:5ddf4be454010327b9aa79c33cd447e5fb1ec64e7ad4add9702731dfdd497c6d \
+    index.docker.io/sourcegraph/jaeger-all-in-one:3.43.0@sha256:033ac2be811a15f8acb5098d59f0a53b14e47f2ed5a640ea3c58fbd9a888a6c3 \
     --memory.max-traces=20000
diff --git a/pure-docker/deploy-migrator.sh b/pure-docker/deploy-migrator.sh
@@ -20,7 +20,7 @@ docker run --detach \
     -e CODEINTEL_PGUSER=sg \
     -e CODEINTEL_PGHOST=codeintel-db \
     -e CODEINSIGHTS_PGDATASOURCE=postgres://postgres:password@codeinsights-db:5432/postgres \
-    index.docker.io/sourcegraph/migrator:insiders@sha256:323ad71a75a6a99bd90ada1e1dd135f204f4c00cc81f70c41c5f1bf3d09d0538 \
+    index.docker.io/sourcegraph/migrator:3.43.0@sha256:d61df586e051294252b9a67ed98843ea1428a351952f84eab93585fdae296227 \
     up -db=all
 
 echo "Deployed migrator service"
diff --git a/pure-docker/deploy-minio.sh b/pure-docker/deploy-minio.sh
@@ -21,5 +21,5 @@ docker run --detach \
     -v $VOLUME:/data \
     -e MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE \
     -e MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY \
-    index.docker.io/sourcegraph/minio:insiders@sha256:d5377e0c6e4ed742c551f253591d4a1a7f3a104ca17c51d46d6324206577f209 \
+    index.docker.io/sourcegraph/minio:3.43.0@sha256:50319e1de1b733fac50aeabc470a6dc0cd827ffd6e6bee0d094494f0bce28ac6 \
     server /data
diff --git a/pure-docker/deploy-otel-collector.sh b/pure-docker/deploy-otel-collector.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+
+# Description: Ingests and exports OpenTelemetry data.
+#
+# Disk: none
+# Ports exposed to other Sourcegraph services: 4317 (receiver), 55679 (zpages)
+# Ports exposed to the public internet: none
+#
+docker run --detach \
+    --name=otel-collector \
+    --network=sourcegraph \
+    --restart=always \
+    --cpus="0.5" \
+    --memory=512m \
+    -e JAEGER_HOST=jaeger \
+    -v $(pwd)/../otel-collector/config.yaml:/etc/otel-collector/config.yaml \
+    index.docker.io/sourcegraph/opentelemetry-collector:169257_2022-08-25_bb67d3645e59@sha256:a10375336bc505767533b1ec2d32c319e379365e5d6809c1d1dcab1b7fb4798f \
+    --config /etc/otel-collector/configs/jaeger.yaml
diff --git a/pure-docker/deploy-pgsql.sh b/pure-docker/deploy-pgsql.sh
@@ -19,7 +19,7 @@ docker run --detach \
     --memory=2g \
     -e PGDATA=/var/lib/postgresql/data/pgdata \
     -v $VOLUME:/var/lib/postgresql/data/ \
-    index.docker.io/sourcegraph/postgres-12-alpine:insiders@sha256:e8f8d8fda4802e1e9f93441ad15b30045add5ebef200086548c232ee3351ad70
+    index.docker.io/sourcegraph/postgres-12-alpine:3.43.0@sha256:10586005197bf1f71dfc98cf8452defb92fc26042d9812231b31c030bd65035c
 
 # Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
 # but anything 12 and higher is supported.
diff --git a/pure-docker/deploy-precise-code-intel-worker.sh b/pure-docker/deploy-precise-code-intel-worker.sh
@@ -14,7 +14,7 @@ docker run --detach \
     --cpus=2 \
     --memory=4g \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-    -e JAEGER_AGENT_HOST=jaeger \
-    index.docker.io/sourcegraph/precise-code-intel-worker:3.41.0@sha256:2e5c54f47fd05117717a0784487221602099424e6531bca0489c850088d6f7de
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
+    index.docker.io/sourcegraph/precise-code-intel-worker:3.43.0@sha256:39c2ca49ff9f33dffb00b8a66aa2a3105a5039a278a7c9d8d45e2e18c5cabcd0
 
 echo "Deployed precise-code-intel-worker service"
diff --git a/pure-docker/deploy-prometheus.sh b/pure-docker/deploy-prometheus.sh
@@ -21,4 +21,4 @@ docker run --detach \
     -v $VOLUME:/prometheus \
     -v $(pwd)/../prometheus:/sg_prometheus_add_ons \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-    index.docker.io/sourcegraph/prometheus:insiders@sha256:b36ad28d24e010cfacb6c21d8b95656f78e2f1cd74ab43fdddfa35b181d9fe39
+    index.docker.io/sourcegraph/prometheus:3.43.0@sha256:5e8bdb135a6bc13238ec73b5d0af92b5eea1efeb49b8b1a72e3c208c6cc351d4
diff --git a/pure-docker/deploy-redis-cache.sh b/pure-docker/deploy-redis-cache.sh
@@ -18,6 +18,6 @@ docker run --detach \
     --cpus=1 \
     --memory=6g \
     -v $VOLUME:/redis-data \
-    index.docker.io/sourcegraph/redis-cache:insiders@sha256:b4810d7505d69d29c9b1a9e2f4d6a2ad7287b33ef6c6a92653bb41fa49df958e
+    index.docker.io/sourcegraph/redis-cache:3.43.0@sha256:cf32f5d3dfc36a8cdcbefec472358aedfc99b7abe229e98bb062310acd099f33
 
 echo "Deployed redis-cache service"
diff --git a/pure-docker/deploy-redis-store.sh b/pure-docker/deploy-redis-store.sh
@@ -18,6 +18,6 @@ docker run --detach \
     --cpus=1 \
     --memory=6g \
     -v $VOLUME:/redis-data \
-    index.docker.io/sourcegraph/redis-store:insiders@sha256:b585f6b1ad105067b44f633baad0361346782f9b3ee9988d6e85354b0fafc193
+    index.docker.io/sourcegraph/redis-store:3.43.0@sha256:bd96a7e89079ed63dbcca54eaf30bf0b25b86999f34f186c2061dc9408d5053a
 
 echo "Deployed redis-store service"
diff --git a/pure-docker/deploy-repo-updater.sh b/pure-docker/deploy-repo-updater.sh
@@ -20,9 +20,9 @@ docker run --detach \
     --memory=4g \
     -e GOMAXPROCS=1 \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-    -e JAEGER_AGENT_HOST=jaeger \
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
     -e GITHUB_BASE_URL=http://github-proxy:3180 \
     -v $VOLUME:/mnt/cache \
-    index.docker.io/sourcegraph/repo-updater:insiders@sha256:1f500c06ab1ce74e78bf11c283ba1f5cebc2b0460017f8c04f2f695e5ce46b35
+    index.docker.io/sourcegraph/repo-updater:3.43.0@sha256:839f7a16790698c7b408a2ae05389022833843cc41072800b43cba00c7a49c9d
 
 echo "Deployed repo-updater service"
diff --git a/pure-docker/deploy-searcher.sh b/pure-docker/deploy-searcher.sh
@@ -20,8 +20,8 @@ docker run --detach \
     --memory=2g \
     -e GOMAXPROCS=2 \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-    -e JAEGER_AGENT_HOST=jaeger \
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
     -v $VOLUME:/mnt/cache \
-    index.docker.io/sourcegraph/searcher:insiders@sha256:688cdaf477a9aab4f06cdddd719a63ac59a8e6477795a3afff3f0f186079cb2f
+    index.docker.io/sourcegraph/searcher:3.43.0@sha256:bbfdf8e8fcc29ae50033d1e8d68d29cd2925e33bd52670dd4b920e27ae9e2090
 
 echo "Deployed searcher $1 service"
diff --git a/pure-docker/deploy-symbols.sh b/pure-docker/deploy-symbols.sh
@@ -20,8 +20,8 @@ docker run --detach \
     --memory=4g \
     -e GOMAXPROCS=2 \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-    -e JAEGER_AGENT_HOST=jaeger \
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
     -v $VOLUME:/mnt/cache \
-    index.docker.io/sourcegraph/symbols:insiders@sha256:61d94f24446303be2222707cfeebfe7e487b2b2e6ec308d22a659434c8b15109
+    index.docker.io/sourcegraph/symbols:3.43.0@sha256:b242e3cfa5cd4cc9145ba6b6cd1aefeec1f4b54ff0791041107e29043812c559
 
 echo "Deployed symbols $1 service"
diff --git a/pure-docker/deploy-syntect-server.sh b/pure-docker/deploy-syntect-server.sh
@@ -15,6 +15,6 @@ docker run --detach \
     --restart=always \
     --cpus=4 \
     --memory=6g \
-    index.docker.io/sourcegraph/syntax-highlighter:insiders@sha256:9a55861de5274a1febe8fd21217304b7fd69afedb85eefa42aa8b17fc28017cb
+    index.docker.io/sourcegraph/syntax-highlighter:3.43.0@sha256:33fc9a925245493069306b5ea924c16091a344f03bad88525945866d74acb508
 
 echo "Deployed syntect-server service"
diff --git a/pure-docker/deploy-worker.sh b/pure-docker/deploy-worker.sh
@@ -20,13 +20,13 @@ docker run --detach \
     --memory=4g \
     -e GOMAXPROCS=1 \
     -e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-    -e JAEGER_AGENT_HOST=jaeger \
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
     -e GITHUB_BASE_URL=http://github-proxy:3180 \
     -e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
     -e SEARCHER_URL="$(addresses "http://searcher-" $NUM_SEARCHER ":3181")" \
     -e SRC_GIT_SERVERS="$(addresses "gitserver-" $NUM_GITSERVER ":3178")" \
     -e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \
     -v $VOLUME:/mnt/cache \
-    index.docker.io/sourcegraph/worker:insiders@sha256:db428aa8602142005970708a6211b395c0798cf0b1ef1f40530860990ea2b1f9
+    index.docker.io/sourcegraph/worker:3.43.0@sha256:2e1cebd243feebb49026e7ae1572b2db4694cc419f98d6932a097a85a7211940
 
 echo "Deployed worker service"
diff --git a/pure-docker/deploy-zoekt-indexserver.sh b/pure-docker/deploy-zoekt-indexserver.sh
@@ -4,8 +4,8 @@ source ./replicas.sh
 
 # Rename the old ~/sourcegraph-docker/zoekt-shared-disk -> ~/sourcegraph-docker/zoekt-$1-shared-disk
 # if it exists. This ensures we don't have to rebuild the search index from scratch.
-if [ -e ~/sourcegraph-docker/zoekt-shared-disk ] 
-then mv ~/sourcegraph-docker/zoekt-shared-disk ~/sourcegraph-docker/zoekt-$1-shared-disk
+if [ -e ~/sourcegraph-docker/zoekt-shared-disk ]; then
+    mv ~/sourcegraph-docker/zoekt-shared-disk ~/sourcegraph-docker/zoekt-$1-shared-disk
 fi
 
 # Description: Backend for indexed text search operations.
@@ -28,7 +28,9 @@ docker run --detach \
     -e GOMAXPROCS=8 \
     -e HOSTNAME=zoekt-webserver-$1:6070 \
     -e SRC_FRONTEND_INTERNAL=http://sourcegraph-frontend-internal:3090 \
+    -e 'OPENTELEMETRY_DISABLED=false' \
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
     -v $VOLUME:/data/index \
-    index.docker.io/sourcegraph/search-indexer:insiders@sha256:55f663b91ae3cd717262961f34f92ab708b88f07f956bbaa98d81393dbc440d0
+    index.docker.io/sourcegraph/search-indexer:3.43.0@sha256:803d2b18acb564810edfab44517b0b210d301e2989a8f55839f9a4636e873d76
 
 echo "Deployed zoekt-indexserver $1 service"
diff --git a/pure-docker/deploy-zoekt-webserver.sh b/pure-docker/deploy-zoekt-webserver.sh
@@ -21,7 +21,9 @@ docker run --detach \
     --memory=100g \
     -e GOMAXPROCS=16 \
     -e HOSTNAME=zoekt-webserver-$1:6070 \
+    -e 'OPENTELEMETRY_DISABLED=false' \
+    -e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
     -v $VOLUME:/data/index \
-    index.docker.io/sourcegraph/indexed-searcher:insiders@sha256:c7dee54ab00c0ffcdf9baefacb694828d5b42d8d89d39027f3e8076baa7a1616
+    index.docker.io/sourcegraph/indexed-searcher:3.43.0@sha256:9a94438fb636e8c97cbb5ec8abefda0d39a30dad3dfa9f1ce7a2d113ef88d139
 
 echo "Deployed zoekt-webserver $1 service"
diff --git a/pure-docker/deploy.sh b/pure-docker/deploy.sh
@@ -8,7 +8,7 @@ source ./replicas.sh
 
 ./teardown.sh
 
-docker network create sourcegraph &> /dev/null || true
+docker network create sourcegraph &>/dev/null || true
 
 ./deploy-cadvisor.sh
 ./deploy-github-proxy.sh
@@ -25,24 +25,23 @@ for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done
 ./deploy-redis-store.sh
 ./deploy-repo-updater.sh
 ./deploy-worker.sh
+./deploy-otel-collector.sh
 for i in $(seq 0 $(($NUM_SEARCHER - 1))); do ./deploy-searcher.sh $i; done
 for i in $(seq 0 $(($NUM_SYMBOLS - 1))); do ./deploy-symbols.sh $i; done
 ./deploy-syntect-server.sh
 for i in $(seq 0 $(($NUM_INDEXED_SEARCH - 1))); do ./deploy-zoekt-indexserver.sh $i; done
 for i in $(seq 0 $(($NUM_INDEXED_SEARCH - 1))); do ./deploy-zoekt-webserver.sh $i; done
 
 ./deploy-migrator.sh
-while [ "$(docker inspect migrator --format '{{.State.Status}}')" != "exited" ]
-do
+while [ "$(docker inspect migrator --format '{{.State.Status}}')" != "exited" ]; do
   echo "waiting for migrator to complete"
   sleep 5
 done
 
 # Redis must be started before these.
 ./deploy-frontend-internal.sh
 # Wait for frontend-internal to run migrations before starting remaining frontend containers
-while [ "$(docker inspect sourcegraph-frontend-internal --format '{{.State.Health.Status}}')" != "healthy" ]
-do
+while [ "$(docker inspect sourcegraph-frontend-internal --format '{{.State.Health.Status}}')" != "healthy" ]; do
   echo "waiting for internal frontend to start"
   sleep 5
 done
diff --git a/pure-docker/teardown.sh b/pure-docker/teardown.sh
@@ -30,6 +30,7 @@ docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &> /dev/null || true &
 docker rm -f syntect-server &> /dev/null || true &
 docker rm -f $(addresses "zoekt-indexserver-" $NUM_INDEXED_SEARCH "") &> /dev/null || true &
 docker rm -f $(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH "") &> /dev/null || true &
+docker rm -f otel-collector &> /dev/null || true &
 
 docker network rm sourcegraph &> /dev/null || true &
 wait
diff --git a/test/smoke-test.sh b/test/smoke-test.sh
@@ -13,7 +13,7 @@ deploy_sourcegraph() {
 			expect_containers="62"
 		else
 			# Expected number of containers on `master` branch.
-			expect_containers="25"
+			expect_containers="26"
 		fi
 	elif [[ "$TEST_TYPE" == "docker-compose-test" ]]; then
 		docker-compose --file docker-compose/docker-compose.yaml up -d -t 600
@@ -59,8 +59,8 @@ test_containers() {
 catch_errors() {
 	count=$(docker ps --format '{{.Names}}:{{.Status}}' | grep -c -v Up) || true
 	if [[ $count -ne 0 ]]; then
-            containers_failing=$(docker ps --format '{{.Names}}:{{.Status}}' | grep -v Up | cut -f 1 -d :)
-	    echo
+		containers_failing=$(docker ps --format '{{.Names}}:{{.Status}}' | grep -v Up | cut -f 1 -d :)
+		echo
 		for cf in $containers_failing; do
 			echo "$cf is failing. Review the log files uploaded as artefacts to see errors."
 			docker logs -t "$cf" >"$cf".log 2>&1
diff --git a/tools/update-docker-tags.sh b/tools/update-docker-tags.sh
@@ -7,4 +7,4 @@ cd "$root_dir"
 
 CONSTRAINT=$1
 
-go run ./tools/enforce-tags "$CONSTRAINT" .
+go run ./tools/enforce-tags "$CONSTRAINT" ./pure-docker

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"editor.formatOnSave": true,`
`3`	`3`	`"editor.defaultFormatter": "esbenp.prettier-vscode",`
	`4`	`+ "[shellscript]": {`
	`5`	`+ "editor.defaultFormatter": "foxundermoon.shell-format",`
	`6`	`+ },`
`4`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ docker run --detach \`
`21`	`21`	`-v $VOLUME:/var/lib/grafana \`
`22`	`22`	`-v $(pwd)/../grafana/datasources:/sg_config_grafana/provisioning/datasources \`
`23`	`23`	`-v $(pwd)/../grafana/dashboards:/sg_grafana_additional_dashboards \`
`24`		`- index.docker.io/sourcegraph/grafana:insiders@sha256:00064d24e19e1159dd70d12bc328db64e8c45fb53062b9b0e3db93984371836d`
	`24`	`+ index.docker.io/sourcegraph/grafana:3.43.0@sha256:5510222f06238fb110900f44f0bb92f2d0fd9d02b1191e11bc132ee644ce9c75`
`25`	`25`
`26`	`26`	`# Add the following lines above if you wish to use an auth proxy with Grafana:`
`27`	`27`	`#`