@gitpod/gitpod-protocol 0.1.5-vn-6525.78 → 0.1.5-vn-update-gitpod-json-schema.0

package/src/util/generate-workspace-id.ts

@@ -3,15 +3,19 @@
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */
+
 import randomNumber = require("random-number-csprng");
 
 export async function generateWorkspaceID(firstSegment?: string, secondSegment?: string): Promise<string> {
     const firstSeg = clean(firstSegment) || (await random(colors));
-    const secSeg = clean(secondSegment, Math.min(15, 23 - firstSeg.length)) || (await random(animals));
-    return firstSeg + "-" + secSeg + "-" + (await random(characters, 11));
+    const secSeg = clean(secondSegment) || (await random(animals));
+    function fit(makeFit: string, otherSeg: string) {
+        return makeFit.substring(0, Math.max(segLength, 2 * segLength - otherSeg.length));
+    }
+    return fit(firstSeg, secSeg) + "-" + fit(secSeg, firstSeg) + "-" + (await random(characters, segLength));
 }
 
-function clean(segment: string | undefined, maxChars: number = 15) {
+function clean(segment: string | undefined, maxChars: number = 16) {
     if (!segment) {
         return undefined;
     }
@@ -35,6 +39,8 @@ async function random(array: string[], length: number = 1): Promise<string> {
     return result;
 }
 
+const segLength = 11;
+
 const characters = "abcdefghijklmnopqrstuvwxyz0123456789".split("");
 
 export const colors = [

package/src/util/logging.ts

@@ -315,7 +315,6 @@ function makeLogItem(
         component,
         severity,
         time: new Date().toISOString(),
-        environment: process.env.KUBE_STAGE,
         context,
         message,
         error,

package/src/util/tracing.ts

@@ -22,17 +22,15 @@ export type TraceContextWithSpan = TraceContext & {
 export namespace TraceContext {
     export function startSpan(operation: string, parentCtx?: TraceContext): opentracing.Span {
         const options: opentracing.SpanOptions = {};
-        if (parentCtx && parentCtx.span && !!parentCtx.span.context().toSpanId()) {
-            options.childOf = parentCtx.span;
+
+        // references should contain span id.
+        // cf. https://github.com/jaegertracing/jaeger-client-node/issues/432
+        if (!!parentCtx?.span) {
+            const ctx = parentCtx?.span?.context();
+            if (ctx && !!ctx.toTraceId() && !!ctx.toSpanId()) {
+                options.references = [opentracing.followsFrom(ctx)];
+            }
         }
-        // TODO(gpl) references lead to a huge amount of errors in prod logs. Avoid those until we have time to figure out how to fix it.
-        // if (referencedSpans) {
-        //     // note: allthough followsForm's type says it takes 'opentracing.Span | opentracing.SpanContext', it only works with SpanContext (typing mismatch)
-        //     // note2: we need to filter out debug spans (spanId === "")
-        //     options.references = referencedSpans.filter(s => s !== undefined)
-        //         .filter(s => !!s!.context().toSpanId())
-        //         .map(s => followsFrom(s!.context()));
-        // }
 
         return opentracing.globalTracer().startSpan(operation, options);
     }

package/src/workspace-instance.ts

@@ -98,9 +98,13 @@ export type WorkspaceInstancePhase =
     | "unknown"
 
     // Preparing means that we haven't actually started the workspace instance just yet, but rather
-    // are still preparing for launch. This means we're building the Docker image for the workspace.
+    // are still preparing for launch.
     | "preparing"
 
+    // Building means that we are building the Docker image for the workspace. A workspace will enter this phase only
+    // if an image build is required for that workspace.
+    | "building"
+
     // Pending means the workspace does not yet consume resources in the cluster, but rather is looking for
     // some space within the cluster. If for example the cluster needs to scale up to accomodate the
     // workspace, the workspace will be in Pending state until that happened.
@@ -204,6 +208,12 @@ export interface WorkspaceInstanceRepoStatus {
     totalUnpushedCommits?: number;
 }
 
+// ConfigurationIdeConfig ide config of WorkspaceInstanceConfiguration
+export interface ConfigurationIdeConfig {
+    useLatest?: boolean;
+    desktopIdeAlias?: string;
+}
+
 // WorkspaceInstanceConfiguration contains all per-instance configuration
 export interface WorkspaceInstanceConfiguration {
     // theiaVersion is the version of Theia this workspace instance uses
@@ -221,6 +231,8 @@ export interface WorkspaceInstanceConfiguration {
 
     // supervisorImage is the ref of the supervisor image this instance uses.
     supervisorImage?: string;
+
+    ideConfig?: ConfigurationIdeConfig;
 }
 
 /**

package/src/wsready.ts

@@ -4,7 +4,7 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-// generated using github.com/32leaves/bel on 2022-02-15 11:53:18.380158212 +0000 UTC m=+0.011913675
+// generated using github.com/32leaves/bel on 2022-03-29 17:08:06.113873917 +0000 UTC m=+0.010035965
 // DO NOT MODIFY
 
 export enum WorkspaceInitSource {