@gitpod/gitpod-protocol 0.1.5-port-description-3059-fork.0 → 0.1.5-port-description-3059-fork.2

package/lib/util/tracing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/util/tracing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/util/tracing.ts"],"names":[],"mappings":"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"}

package/lib/util/tracing.js

@@ -16,49 +16,62 @@ const opentracing = require("opentracing");
 const jaeger_client_1 = require("jaeger-client");
 const opentracing_1 = require("opentracing");
 const inversify_1 = require("inversify");
+const logging_1 = require("./logging");
 var TraceContext;
 (function (TraceContext) {
     function startSpan(operation, parentCtx) {
-        const options = {
-            childOf: parentCtx.span
-        };
+        let options = undefined;
+        if (parentCtx) {
+            options = {
+                childOf: parentCtx.span
+            };
+        }
         return opentracing.globalTracer().startSpan(operation, options);
     }
     TraceContext.startSpan = startSpan;
-    function childContextWithSpan(operation, parentCtx) {
+    function childContext(operation, parentCtx) {
         const span = startSpan(operation, parentCtx);
         return { span };
     }
-    TraceContext.childContextWithSpan = childContextWithSpan;
-    function startAsyncSpan(operation, ctx) {
-        const options = {};
-        if (!!ctx.span) {
-            options.references = [opentracing.followsFrom(ctx.span.context())];
-        }
-        return opentracing.globalTracer().startSpan(operation, options);
-    }
-    TraceContext.startAsyncSpan = startAsyncSpan;
-    function logError(ctx, err) {
+    TraceContext.childContext = childContext;
+    function setError(ctx, err) {
         if (!ctx.span) {
             return;
         }
-        ctx.span.log({
-            "error": err.message,
-            "stacktrace": err.stack
+        TraceContext.addNestedTags(ctx, {
+            error: {
+                message: err.message,
+                stacktrace: err.stack,
+            },
         });
         ctx.span.setTag("error", true);
     }
-    TraceContext.logError = logError;
-    function logJsonRPCError(ctx, method, err) {
+    TraceContext.setError = setError;
+    function setJsonRPCMetadata(ctx, method) {
         if (!ctx.span) {
             return;
         }
-        logError(ctx, err);
-        // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/rpc.md#json-rpc
-        ctx.span.addTags({
+        const tags = {
             rpc: {
                 system: "jsonrpc",
-                method,
+                //  version,
+            },
+        };
+        if (method) {
+            tags.rpc.method = method;
+        }
+        addNestedTags(ctx, tags);
+    }
+    TraceContext.setJsonRPCMetadata = setJsonRPCMetadata;
+    function setJsonRPCError(ctx, method, err) {
+        if (!ctx.span) {
+            return;
+        }
+        // not use setError bc this is (most likely) a working operation
+        setJsonRPCMetadata(ctx);
+        // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/rpc.md#json-rpc
+        addNestedTags(ctx, {
+            rpc: {
                 jsonrpc: {
                     error_code: err.code,
                     error_message: err.message,
@@ -66,22 +79,77 @@ var TraceContext;
             },
         });
     }
-    TraceContext.logJsonRPCError = logJsonRPCError;
-    function addJsonRPCParameters(ctx, method, args) {
+    TraceContext.setJsonRPCError = setJsonRPCError;
+    function addJsonRPCParameters(ctx, params) {
         if (!ctx.span) {
             return;
         }
-        ctx.span.addTags({
+        setJsonRPCMetadata(ctx);
+        addNestedTags(ctx, {
             rpc: {
-                system: "jsonrpc",
-                method,
                 jsonrpc: {
-                    parameters: args.slice(),
+                    parameters: params,
                 },
             },
         });
     }
     TraceContext.addJsonRPCParameters = addJsonRPCParameters;
+    /**
+     * Does what one would expect from `span.addTags`: Calls `span.addTag` for all keys in map, recursively for objects.
+     * Example:
+     * ```
+     * TraceContext.addNestedTags(ctx, {
+     *    rpc: {
+     *       system: "jsonrpc",
+     *       jsonrpc: {
+     *          version: "1.0",
+     *          method: "test",
+     *          parameters: ["abc", "def"],
+     *       },
+     *    },
+     * });
+     * ```
+     * gives
+     * rpc.system = "jsonrpc"
+     * rpc.jsonrpc.version = "1.0"
+     * rpc.jsonrpc.method = "test"
+     * rpc.jsonrpc.parameters.0 = "abc"
+     * rpc.jsonrpc.parameters.1 = "def"
+     * @param ctx
+     * @param keyValueMap
+     * @returns
+     */
+    function addNestedTags(ctx, keyValueMap, _namespace) {
+        if (!ctx.span) {
+            return;
+        }
+        const namespace = _namespace ? `${_namespace}.` : '';
+        try {
+            for (const k of Object.keys(keyValueMap)) {
+                const v = keyValueMap[k];
+                if (v instanceof Object) {
+                    addNestedTags(ctx, v, `${namespace}${k}`);
+                }
+                else {
+                    ctx.span.setTag(`${namespace}${k}`, v);
+                }
+            }
+        }
+        catch (err) {
+            // general resilience against odd shapes/parameters
+            logging_1.log.error("Tracing.addNestedTags", err, { namespace });
+        }
+    }
+    TraceContext.addNestedTags = addNestedTags;
+    function setOWI(ctx, owi) {
+        if (!ctx.span) {
+            return;
+        }
+        addNestedTags(ctx, {
+            context: owi,
+        });
+    }
+    TraceContext.setOWI = setOWI;
 })(TraceContext = exports.TraceContext || (exports.TraceContext = {}));
 let TracingManager = class TracingManager {
     setup(serviceName, opts) {
@@ -93,10 +161,14 @@ let TracingManager = class TracingManager {
             reporter: {
                 logSpans: false
             },
-            serviceName
+            serviceName,
         };
         const t = (0, jaeger_client_1.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) {

package/lib/util/tracing.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/util/tracing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/util/tracing.ts"],"names":[],"mappings":"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"}

package/lib/util/tracing.spec.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+export {};
+//# sourceMappingURL=tracing.spec.d.ts.map

package/lib/util/tracing.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracing.spec.d.ts","sourceRoot":"","sources":["../../src/util/tracing.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/lib/util/tracing.spec.js

@@ -0,0 +1,121 @@
+"use strict";
+/**
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mocha_typescript_1 = require("mocha-typescript");
+const chai = require("chai");
+const tracing_1 = require("./tracing");
+const opentracing_1 = require("opentracing");
+const expect = chai.expect;
+let TestTracing = class TestTracing {
+    testTracingContext_addNestedTags() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tracer = new opentracing_1.MockTracer();
+            const span = tracer.startSpan('testTracingContext_addNestedTags');
+            tracing_1.TraceContext.addNestedTags({ span }, {
+                rpc: {
+                    system: "jsonrpc",
+                    jsonrpc: {
+                        version: "1.0",
+                        method: "test",
+                        parameters: ["abc", "def"],
+                    },
+                },
+            });
+            const mockSpan = tracer.report().spans[0];
+            expect(mockSpan.tags()).to.deep.equal({
+                "rpc.system": "jsonrpc",
+                "rpc.jsonrpc.version": "1.0",
+                "rpc.jsonrpc.method": "test",
+                "rpc.jsonrpc.parameters.0": "abc",
+                "rpc.jsonrpc.parameters.1": "def",
+            });
+        });
+    }
+    testTracingContext_addNestedTags_null() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tracer = new opentracing_1.MockTracer();
+            const span = tracer.startSpan('testTracingContext_addNestedTags_null');
+            tracing_1.TraceContext.addNestedTags({ span }, {
+                someShape: {
+                    thisIsNull: null,
+                    thisIsUndefined: undefined,
+                },
+            });
+            const mockSpan = tracer.report().spans[0];
+            expect(mockSpan.tags()).to.deep.equal({
+                "someShape.thisIsNull": null,
+                "someShape.thisIsUndefined": undefined,
+            });
+        });
+    }
+    testTracingContext_addJsonRPCParameters() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tracer = new opentracing_1.MockTracer();
+            const span = tracer.startSpan('testTracingContext_addJsonRPCParameters');
+            const ctx = { span };
+            tracing_1.TraceContext.addJsonRPCParameters(ctx, {
+                one: "one",
+                two: {
+                    name: "two",
+                    some: "shape",
+                    containing: "PII",
+                },
+                three: "three",
+            });
+            const mockSpan = tracer.report().spans[0];
+            expect(mockSpan.tags()).to.deep.equal({
+                "rpc.jsonrpc.parameters.one": "one",
+                "rpc.jsonrpc.parameters.two.containing": "PII",
+                "rpc.jsonrpc.parameters.two.name": "two",
+                "rpc.jsonrpc.parameters.two.some": "shape",
+                "rpc.jsonrpc.parameters.three": "three",
+                "rpc.system": "jsonrpc",
+            });
+        });
+    }
+};
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], TestTracing.prototype, "testTracingContext_addNestedTags", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], TestTracing.prototype, "testTracingContext_addNestedTags_null", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], TestTracing.prototype, "testTracingContext_addJsonRPCParameters", null);
+TestTracing = __decorate([
+    mocha_typescript_1.suite
+], TestTracing);
+module.exports = new TestTracing();
+//# sourceMappingURL=tracing.spec.js.map

package/lib/util/tracing.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracing.spec.js","sourceRoot":"","sources":["../../src/util/tracing.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -26,6 +26,7 @@
     "@types/analytics-node": "^3.1.5",
     "@types/chai-subset": "^1.3.3",
     "@types/cookie": "^0.4.1",
+    "@types/jaeger-client": "^3.18.3",
     "@types/js-yaml": "^3.10.1",
     "@types/mocha": "^5.2.7",
     "@types/node": "^16.11.6",
@@ -59,5 +60,5 @@
     "watch": "leeway exec --package .:lib --transitive-dependencies --filter-type yarn --components --parallel -- tsc -w --preserveWatchOutput"
   },
   "types": "./lib/index.d.ts",
-  "version": "0.1.5-port-description-3059-fork.0"
+  "version": "0.1.5-port-description-3059-fork.2"
 }

package/pkg-yarn.lock

@@ -4,7 +4,7 @@
 
 "@gitpod/gitpod-protocol@0.1.5":
   version "0.1.5"
-  resolved "file:///tmp/cache/315dc4f3bc0ed7115f4ad492a0465ced896ddb36.tar.gz"
+  resolved "file:///tmp/cache/a3edaf8ff99c8f62a22b010683e0e8456208ad2d.tar.gz"
   dependencies:
     "@types/react" "17.0.32"
     ajv "^6.5.4"

package/src/gitpod-service.ts

@@ -139,6 +139,8 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     setProjectConfiguration(projectId: string, configString: string): Promise<void>;
     fetchProjectRepositoryConfiguration(projectId: string): Promise<string | undefined>;
     guessProjectConfiguration(projectId: string): Promise<string | undefined>;
+    fetchRepositoryConfiguration(cloneUrl: string): Promise<string | undefined>;
+    guessRepositoryConfiguration(cloneUrl: string): Promise<string | undefined>;
 
     // content service
     getContentBlobUploadUrl(name: string): Promise<string>

package/src/messaging/node/connection.ts

@@ -7,58 +7,14 @@
 
 import * as ws from "ws";
 import * as http from "http";
-import * as https from "https";
-import * as url from "url";
 import * as net from "net";
-import { MessageConnection } from "vscode-jsonrpc";
-import { createWebSocketConnection, IWebSocket } from "vscode-ws-jsonrpc";
+import { IWebSocket } from "vscode-ws-jsonrpc";
 import { log } from '../../util/logging';
 
-export interface IServerOptions {
-    readonly server: http.Server | https.Server;
-    readonly path?: string;
-    matches?(request: http.IncomingMessage): boolean;
-}
-
-export function createServerWebSocketConnection(options: IServerOptions, onConnect: (connection: MessageConnection) => void): void {
-    openJsonRpcSocket(options, socket => {
-        onConnect(createWebSocketConnection(socket, console));
-    });
-}
-
-export function openJsonRpcSocket(options: IServerOptions, onOpen: (socket: IWebSocket) => void): void {
-    openSocket(options, socket => {
-        const webSocket = toIWebSocket(socket);
-        onOpen(webSocket);
-    });
-}
-
 export interface OnOpen {
     (webSocket: ws, request: http.IncomingMessage, socket: net.Socket, head: Buffer): void;
 }
 
-export function openSocket(options: IServerOptions, onOpen: OnOpen): void {
-    const wss = new ws.Server({
-        noServer: true,
-            perMessageDeflate: {
-                // don't compress if a message is less than 256kb
-                threshold: 256 * 1024
-            }
-    });
-    options.server.on('upgrade', (request: http.IncomingMessage, socket: net.Socket, head: Buffer) => {
-        const pathname = request.url ? url.parse(request.url).pathname : undefined;
-        if (options.path && pathname === options.path || options.matches && options.matches(request)) {
-            wss.handleUpgrade(request, socket, head, webSocket => {
-                if (webSocket.readyState === webSocket.OPEN) {
-                    onOpen(webSocket, request, socket, head);
-                } else {
-                    webSocket.on('open', () => onOpen(webSocket, request, socket, head));
-                }
-            });
-        }
-    });
-}
-
 export function toIWebSocket(webSocket: ws) {
     let sendsAfterOpen = 0;
     return <IWebSocket>{

package/src/protocol.ts

@@ -558,7 +558,7 @@ export interface WorkspaceConfig {
     github?: GithubAppConfig;
     vscode?: VSCodeConfig;
 
-    /** tailscale demo */
+    /** deprecated. Enabled by default **/
     experimentalNetwork?: boolean;
 
     /**

package/src/util/garbage-collected-cache.ts

@@ -4,6 +4,8 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
+import { repeat } from "./repeat";
+
 
 interface CacheEntry<T> {
     key: string;
@@ -41,8 +43,12 @@ export class GarbageCollectedCache<T> {
         return entry.value;
     }
 
+    public delete(key: string) {
+        this.store.delete(key);
+    }
+
     protected regularlyCollectGarbage() {
-        setInterval(() => this.collectGarbage(), this.gcIntervalSeconds * 1000);
+        repeat(() => this.collectGarbage(), this.gcIntervalSeconds * 1000);
     }
 
     protected collectGarbage() {

package/src/util/jaeger-client-types.ts

@@ -0,0 +1,102 @@
+/**
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+import { opentracing } from "jaeger-client";
+
+// Type definitions for jaeger-client which are not exported by @types/jaeger-client
+// Project: https://github.com/uber/jaeger-client-node
+// Definitions by: Julian Steger <https://github.com/julianste>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface TracingConfig {
+    serviceName?: string;
+    disable?: boolean;
+    sampler?: SamplerConfig;
+    reporter?: ReporterConfig;
+}
+
+export interface TracingOptions {
+    reporter?: Reporter;
+    metrics?: MetricsFactory;
+    logger?: Logger;
+    tags?: any;
+}
+
+export interface ReporterConfig {
+    logSpans?: boolean;
+    agentHost?: string;
+    agentPort?: number;
+    flushIntervalMs?: number;
+}
+
+export interface SamplerConfig {
+    type: string;
+    param: number;
+    host?: string;
+    port?: number;
+    refreshIntervalMs?: number;
+}
+
+export interface Logger {
+    info(msg: string): void;
+    error(msg: string): void;
+}
+
+export interface Reporter {
+    report(span: opentracing.Span): void;
+    close(callback?: () => void): void;
+    setProcess(serviceName: string, tags: any): void;
+}
+
+export interface MetricsFactory {
+    createCounter(name: string, tags: any): Counter;
+    createTimer(name: string, tags: any): Timer;
+    createGauge(name: string, tags: any): Gauge;
+}
+
+// Counter tracks the number of times an event has occurred
+export interface Counter {
+    // Adds the given value to the counter.
+    increment(delta: number): void;
+}
+
+// Timer tracks how long an operation took and also computes percentiles.
+export interface Timer {
+    // Records the time passed in.
+    record(value: number): void;
+}
+
+// Gauge returns instantaneous measurements of something as an int64 value
+export interface Gauge {
+    // Update the gauge to the value passed in.
+    update(value: number): void;
+}
+
+// export function initTracer(
+//     tracingConfig: TracingConfig,
+//     tracingOptions: TracingOptions,
+// ): opentracing.Tracer;
+
+// export function initTracerFromEnv(
+//     tracingConfig: TracingConfig,
+//     tracingOptions: TracingOptions,
+// ): opentracing.Tracer;
+
+export interface SamplingDecision {
+    sample: boolean;
+    retryable: boolean;
+    tags: any;
+}
+
+// added by TypeFox
+export interface Sampler {
+    name(): string
+    isSampled(operation: string, tags: any): boolean;
+    onCreateSpan(span: opentracing.Span): SamplingDecision;
+    onSetOperationName(span: opentracing.Span, operationName: string): SamplingDecision;
+    onSetTag(span: opentracing.Span, key: string, value: any): SamplingDecision;
+    close(callback: () => void): void
+}

package/src/util/repeat.ts

@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+import { Disposable } from "..";
+import { log } from "./logging";
+
+/**
+ * This intends to be a drop-in replacement for 'setInterval' implemented with a 'setTimeout' chain
+ * to ensure we're not creating more timeouts than we can process.
+ * @param op
+ * @param everyMilliseconds
+ * @returns
+ */
+export function repeat(op: () => Promise<void> | void, everyMilliseconds: number): Disposable {
+    let timer: NodeJS.Timeout | undefined = undefined;
+    let stopped = false;
+    const repeated = () => {
+        if (stopped) {
+            // in case we missed the clearTimeout i 'await'
+            return;
+        }
+
+        timer = setTimeout(async () => {
+            try {
+                await op();
+            } catch (err) {
+                // catch error here to
+                log.error(err);
+            }
+
+            repeated(); // chain ourselves - after the 'await'
+        }, everyMilliseconds);
+    };
+    repeated();
+
+    return Disposable.create(() => {
+        stopped = true;
+        if (timer) {
+            clearTimeout(timer);
+        }
+    });
+}