component/gitpod-protocol/tracing: Add version tags to all spans

Signed-off-by: ArthurSens <[email protected]>
gitpod-io · Dec 8, 2021 · 28bf0e6 · 28bf0e6
1 parent da3991c
commit 28bf0e6
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 1 deletion.
diff --git a/components/dashboard/BUILD.yaml b/components/dashboard/BUILD.yaml
@@ -41,6 +41,8 @@ packages:
     argdeps:
       - imageRepoBase
     config:
+      buildArgs:
+        VERSION: ${version}
       dockerfile: leeway.Dockerfile
       metadata:
         helm-component: dashboard

diff --git a/components/dashboard/leeway.Dockerfile b/components/dashboard/leeway.Dockerfile
@@ -34,3 +34,9 @@ FROM caddy/caddy:2.4.0-alpine
 
 COPY components-dashboard--static/conf/Caddyfile /etc/caddy/Caddyfile
 COPY --from=compress /www /www
+
+ARG __GIT_COMMIT
+ARG VERSION
+
+ENV GITPOD_BUILD_GIT_COMMIT=${__GIT_COMMIT}
+ENV GITPOD_BUILD_VERSION=${VERSION}
diff --git a/components/ee/db-sync/BUILD.yaml b/components/ee/db-sync/BUILD.yaml
@@ -21,6 +21,8 @@ packages:
     argdeps:
       - imageRepoBase
     config:
+      buildArgs:
+        VERSION: ${version}
       dockerfile: leeway.Dockerfile
       metadata:
         helm-component: dbSync

diff --git a/components/ee/db-sync/leeway.Dockerfile b/components/ee/db-sync/leeway.Dockerfile
@@ -16,4 +16,10 @@ COPY --from=builder /app /app/
 USER unode
 WORKDIR /app/node_modules/@gitpod/db-sync
 ENTRYPOINT [ "yarn", "start" ]
+
+ARG __GIT_COMMIT
+ARG VERSION
+
+ENV GITPOD_BUILD_GIT_COMMIT=${__GIT_COMMIT}
+ENV GITPOD_BUILD_VERSION=${VERSION}
 CMD [ "run", "--soft-start" ]
diff --git a/components/ee/kedge/BUILD.yaml b/components/ee/kedge/BUILD.yaml
@@ -21,6 +21,8 @@ packages:
     argdeps:
       - imageRepoBase
     config:
+      buildArgs:
+        VERSION: ${version}
       dockerfile: leeway.Dockerfile
       metadata:
         helm-component: kedge

diff --git a/components/ee/kedge/leeway.Dockerfile b/components/ee/kedge/leeway.Dockerfile
@@ -8,5 +8,10 @@ RUN apk add --no-cache git bash ca-certificates
 COPY components-ee-kedge--app/kedge /app/
 RUN chmod +x /app/kedge
 
+ARG __GIT_COMMIT
+ARG VERSION
+
+ENV GITPOD_BUILD_GIT_COMMIT=${__GIT_COMMIT}
+ENV GITPOD_BUILD_VERSION=${VERSION}
 ENTRYPOINT [ "/app/kedge" ]
 CMD [ "-v", "help" ]
diff --git a/components/ee/payment-endpoint/BUILD.yaml b/components/ee/payment-endpoint/BUILD.yaml
@@ -36,6 +36,8 @@ packages:
     argdeps:
       - imageRepoBase
     config:
+      buildArgs:
+        VERSION: ${version}
       dockerfile: leeway.Dockerfile
       metadata:
         helm-component: paymentEndpoint

diff --git a/components/ee/payment-endpoint/leeway.Dockerfile b/components/ee/payment-endpoint/leeway.Dockerfile
@@ -16,4 +16,10 @@ RUN useradd --create-home --uid 31001 --home-dir /app/ unode
 COPY --from=builder /app /app/
 USER unode
 WORKDIR /app/node_modules/@gitpod/gitpod-payment-endpoint
+
+ARG __GIT_COMMIT
+ARG VERSION
+
+ENV GITPOD_BUILD_GIT_COMMIT=${__GIT_COMMIT}
+ENV GITPOD_BUILD_VERSION=${VERSION}
 CMD exec yarn start
diff --git a/components/gitpod-db/BUILD.yaml b/components/gitpod-db/BUILD.yaml
@@ -91,6 +91,8 @@ packages:
     argdeps:
       - imageRepoBase
     config:
+      buildArgs:
+        VERSION: ${version}
       dockerfile: leeway.Dockerfile
       metadata:
         helm-component: dbMigrations

diff --git a/components/gitpod-db/leeway.Dockerfile b/components/gitpod-db/leeway.Dockerfile
@@ -23,3 +23,8 @@ COPY --from=proxy /etc/ssl/certs/ /etc/ssl/certs/
 COPY --chown=10000:10000 --from=builder /app /app/
 WORKDIR /app/node_modules/@gitpod/gitpod-db
 
+ARG __GIT_COMMIT
+ARG VERSION
+
+ENV GITPOD_BUILD_GIT_COMMIT=${__GIT_COMMIT}
+ENV GITPOD_BUILD_VERSION=${VERSION}
diff --git a/components/gitpod-protocol/src/util/tracing.ts b/components/gitpod-protocol/src/util/tracing.ts
@@ -174,8 +174,13 @@ export class TracingManager {
             serviceName,
         }
         const t = initTracerFromEnv(config, {
-            logger: console
+            logger: console,
+            tags: {
+                'service.build.commit': process.env.GITPOD_BUILD_GIT_COMMIT,
+                'service.build.version': process.env.GITPOD_BUILD_VERSION,
+            }
         });
+
         if (opts) {
             if (opts.perOpSampling) {
                 (t as any)._sampler = new PerOperationSampler((t as any)._sampler, opts.perOpSampling);

diff --git a/components/proxy/BUILD.yaml b/components/proxy/BUILD.yaml
@@ -7,6 +7,8 @@ packages:
     argdeps:
       - imageRepoBase
     config:
+      buildArgs:
+        VERSION: ${version}
       dockerfile: Dockerfile
       metadata:
         helm-component: proxy

diff --git a/components/proxy/Dockerfile b/components/proxy/Dockerfile
@@ -36,4 +36,10 @@ COPY --from=builder /caddy /usr/bin/caddy
 COPY conf/Caddyfile /etc/caddy/Caddyfile
 COPY conf/vhost.empty /etc/caddy/vhosts/vhost.empty
 
+ARG __GIT_COMMIT
+ARG VERSION
+
+ENV GITPOD_BUILD_GIT_COMMIT=${__GIT_COMMIT}
+ENV GITPOD_BUILD_VERSION=${VERSION}
+
 CMD [ "caddy", "run", "-watch", "-config", "/etc/caddy/Caddyfile" ]
diff --git a/components/server/BUILD.yaml b/components/server/BUILD.yaml
@@ -28,6 +28,8 @@ packages:
     argdeps:
       - imageRepoBase
     config:
+      buildArgs:
+        VERSION: ${version}
       dockerfile: leeway.Dockerfile
       metadata:
         helm-component: server

diff --git a/components/server/leeway.Dockerfile b/components/server/leeway.Dockerfile
@@ -36,4 +36,10 @@ COPY --from=builder /app /app/
 USER unode
 WORKDIR /app/node_modules/@gitpod/server
 # Don't use start-ee-inspect as long as we use native modules (casues segfault)
+
+ARG __GIT_COMMIT
+ARG VERSION
+
+ENV GITPOD_BUILD_GIT_COMMIT=${__GIT_COMMIT}
+ENV GITPOD_BUILD_VERSION=${VERSION}
 CMD exec yarn start-ee
diff --git a/components/ws-manager-bridge/BUILD.yaml b/components/ws-manager-bridge/BUILD.yaml
@@ -24,6 +24,8 @@ packages:
     argdeps:
       - imageRepoBase
     config:
+      buildArgs:
+        VERSION: ${version}
       dockerfile: leeway.Dockerfile
       metadata:
         helm-component: wsManagerBridge

diff --git a/components/ws-manager-bridge/leeway.Dockerfile b/components/ws-manager-bridge/leeway.Dockerfile
@@ -16,4 +16,10 @@ RUN useradd --no-log-init --create-home --uid 31002 --home-dir /app/ unode
 COPY --from=builder /app /app/
 USER unode
 WORKDIR /app/node_modules/@gitpod/ws-manager-bridge
+
+ARG __GIT_COMMIT
+ARG VERSION
+
+ENV GITPOD_BUILD_GIT_COMMIT=${__GIT_COMMIT}
+ENV GITPOD_BUILD_VERSION=${VERSION}
 CMD exec yarn start-ee