@gitpod/gitpod-protocol 0.1.5-tweak-workspaceconfig-origin-docs-fork.0 → 0.1.5-update-yarnlock.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/data/gitpod-schema.json +150 -8
- package/lib/accounting-protocol.d.ts +21 -11
- package/lib/accounting-protocol.d.ts.map +1 -1
- package/lib/accounting-protocol.js +44 -33
- package/lib/accounting-protocol.js.map +1 -1
- package/lib/admin-protocol.d.ts +29 -1
- package/lib/admin-protocol.d.ts.map +1 -1
- package/lib/admin-protocol.js +1 -1
- package/lib/admin-protocol.js.map +1 -1
- package/lib/analytics.d.ts +5 -6
- package/lib/analytics.d.ts.map +1 -1
- package/lib/analytics.js +1 -1
- package/lib/analytics.js.map +1 -1
- package/lib/attribution.d.ts +25 -0
- package/lib/attribution.d.ts.map +1 -0
- package/lib/attribution.js +58 -0
- package/lib/attribution.js.map +1 -0
- package/lib/auth.d.ts +1 -1
- package/lib/auth.d.ts.map +1 -1
- package/lib/auth.js +1 -1
- package/lib/billing-mode.d.ts +45 -0
- package/lib/billing-mode.d.ts.map +1 -0
- package/lib/billing-mode.js +44 -0
- package/lib/billing-mode.js.map +1 -0
- package/lib/blocked-repositories-protocol.d.ts +13 -0
- package/lib/blocked-repositories-protocol.d.ts.map +1 -0
- package/lib/blocked-repositories-protocol.js +8 -0
- package/lib/blocked-repositories-protocol.js.map +1 -0
- package/lib/context-url.d.ts +19 -7
- package/lib/context-url.d.ts.map +1 -1
- package/lib/context-url.js +60 -9
- package/lib/context-url.js.map +1 -1
- package/lib/context-url.spec.d.ts +3 -3
- package/lib/context-url.spec.d.ts.map +1 -1
- package/lib/context-url.spec.js +20 -12
- package/lib/context-url.spec.js.map +1 -1
- package/lib/encryption/container-module.d.ts +1 -1
- package/lib/encryption/container-module.d.ts.map +1 -1
- package/lib/encryption/container-module.js +2 -2
- package/lib/encryption/container-module.js.map +1 -1
- package/lib/encryption/encryption-engine.d.ts +1 -1
- package/lib/encryption/encryption-engine.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.js +10 -10
- package/lib/encryption/encryption-engine.js.map +1 -1
- package/lib/encryption/encryption-engine.spec.d.ts +1 -1
- package/lib/encryption/encryption-engine.spec.d.ts.map +1 -1
- package/lib/encryption/encryption-engine.spec.js +3 -4
- package/lib/encryption/encryption-engine.spec.js.map +1 -1
- package/lib/encryption/encryption-service.d.ts +1 -1
- package/lib/encryption/encryption-service.d.ts.map +1 -1
- package/lib/encryption/encryption-service.js +2 -2
- package/lib/encryption/encryption-service.js.map +1 -1
- package/lib/encryption/key-provider.d.ts +1 -1
- package/lib/encryption/key-provider.d.ts.map +1 -1
- package/lib/encryption/key-provider.js +8 -10
- package/lib/encryption/key-provider.js.map +1 -1
- package/lib/env.d.ts +1 -6
- package/lib/env.d.ts.map +1 -1
- package/lib/env.js +2 -21
- package/lib/env.js.map +1 -1
- package/lib/experiments/always-default.d.ts +8 -0
- package/lib/experiments/always-default.d.ts.map +1 -0
- package/lib/experiments/always-default.js +20 -0
- package/lib/experiments/always-default.js.map +1 -0
- package/lib/experiments/configcat-server.d.ts +10 -0
- package/lib/experiments/configcat-server.d.ts.map +1 -0
- package/lib/experiments/configcat-server.js +37 -0
- package/lib/experiments/configcat-server.js.map +1 -0
- package/lib/experiments/configcat.d.ts +21 -0
- package/lib/experiments/configcat.d.ts.map +1 -0
- package/lib/experiments/configcat.js +51 -0
- package/lib/experiments/configcat.js.map +1 -0
- package/lib/experiments/types.d.ts +22 -0
- package/lib/experiments/types.d.ts.map +1 -0
- package/lib/experiments/types.js +10 -0
- package/lib/experiments/types.js.map +1 -0
- package/lib/frontend-dashboard-service.d.ts +99 -0
- package/lib/frontend-dashboard-service.d.ts.map +1 -0
- package/lib/frontend-dashboard-service.js +55 -0
- package/lib/frontend-dashboard-service.js.map +1 -0
- package/lib/gitpod-file-parser.d.ts +1 -1
- package/lib/gitpod-file-parser.d.ts.map +1 -1
- package/lib/gitpod-file-parser.js +7 -7
- package/lib/gitpod-file-parser.js.map +1 -1
- package/lib/gitpod-file-parser.spec.d.ts +1 -1
- package/lib/gitpod-file-parser.spec.js +43 -40
- package/lib/gitpod-file-parser.spec.js.map +1 -1
- package/lib/gitpod-service.d.ts +143 -51
- package/lib/gitpod-service.d.ts.map +1 -1
- package/lib/gitpod-service.js +78 -36
- package/lib/gitpod-service.js.map +1 -1
- package/lib/headless-workspace-log.d.ts +2 -1
- package/lib/headless-workspace-log.d.ts.map +1 -1
- package/lib/headless-workspace-log.js +3 -2
- package/lib/headless-workspace-log.js.map +1 -1
- package/lib/ide-frontend-service.d.ts +2 -2
- package/lib/ide-frontend-service.js +1 -1
- package/lib/ide-protocol.d.ts +53 -8
- package/lib/ide-protocol.d.ts.map +1 -1
- package/lib/ide-protocol.js +11 -1
- package/lib/ide-protocol.js.map +1 -1
- package/lib/index.d.ts +17 -15
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +4 -2
- package/lib/index.js.map +1 -1
- package/lib/installation-admin-protocol.d.ts +30 -0
- package/lib/installation-admin-protocol.d.ts.map +1 -0
- package/lib/installation-admin-protocol.js +31 -0
- package/lib/installation-admin-protocol.js.map +1 -0
- package/lib/license-protocol.d.ts +8 -1
- package/lib/license-protocol.d.ts.map +1 -1
- package/lib/license-protocol.js +1 -1
- package/lib/license-protocol.js.map +1 -1
- package/lib/messaging/browser/connection.d.ts +1 -1
- package/lib/messaging/browser/connection.d.ts.map +1 -1
- package/lib/messaging/browser/connection.js +19 -19
- package/lib/messaging/browser/connection.js.map +1 -1
- package/lib/messaging/browser/window-connection.d.ts +5 -5
- package/lib/messaging/browser/window-connection.d.ts.map +1 -1
- package/lib/messaging/browser/window-connection.js +10 -7
- package/lib/messaging/browser/window-connection.js.map +1 -1
- package/lib/messaging/client-call-metrics.d.ts +5 -19
- package/lib/messaging/client-call-metrics.d.ts.map +1 -1
- package/lib/messaging/client-call-metrics.js +35 -23
- package/lib/messaging/client-call-metrics.js.map +1 -1
- package/lib/messaging/error.d.ts +12 -2
- package/lib/messaging/error.d.ts.map +1 -1
- package/lib/messaging/error.js +26 -4
- package/lib/messaging/error.js.map +1 -1
- package/lib/messaging/handler.d.ts.map +1 -1
- package/lib/messaging/handler.js +1 -1
- package/lib/messaging/node/connection.d.ts +1 -17
- package/lib/messaging/node/connection.d.ts.map +1 -1
- package/lib/messaging/node/connection.js +23 -59
- package/lib/messaging/node/connection.js.map +1 -1
- package/lib/messaging/proxy-factory.d.ts +1 -1
- package/lib/messaging/proxy-factory.d.ts.map +1 -1
- package/lib/messaging/proxy-factory.js +7 -9
- package/lib/messaging/proxy-factory.js.map +1 -1
- package/lib/oss-allowlist.d.ts +14 -0
- package/lib/oss-allowlist.d.ts.map +1 -0
- package/lib/oss-allowlist.js +8 -0
- package/lib/oss-allowlist.js.map +1 -0
- package/lib/payment-protocol.d.ts +1 -1
- package/lib/payment-protocol.d.ts.map +1 -1
- package/lib/payment-protocol.js +2 -2
- package/lib/payment-protocol.js.map +1 -1
- package/lib/permission.d.ts +13 -4
- package/lib/permission.d.ts.map +1 -1
- package/lib/permission.js +38 -26
- package/lib/permission.js.map +1 -1
- package/lib/plans.d.ts +8 -5
- package/lib/plans.d.ts.map +1 -1
- package/lib/plans.js +227 -172
- package/lib/plans.js.map +1 -1
- package/lib/protocol.d.ts +238 -104
- package/lib/protocol.d.ts.map +1 -1
- package/lib/protocol.js +322 -105
- package/lib/protocol.js.map +1 -1
- package/lib/protocol.spec.d.ts +7 -0
- package/lib/protocol.spec.d.ts.map +1 -0
- package/lib/protocol.spec.js +127 -0
- package/lib/protocol.spec.js.map +1 -0
- package/lib/snapshot-url.d.ts +1 -1
- package/lib/snapshot-url.js +1 -1
- package/lib/snapshot-url.spec.d.ts +1 -1
- package/lib/snapshot-url.spec.js +1 -1
- package/lib/snapshot-url.spec.js.map +1 -1
- package/lib/team-subscription-protocol.d.ts +24 -4
- package/lib/team-subscription-protocol.d.ts.map +1 -1
- package/lib/team-subscription-protocol.js +25 -6
- package/lib/team-subscription-protocol.js.map +1 -1
- package/lib/teams-projects-protocol.d.ts +39 -6
- package/lib/teams-projects-protocol.d.ts.map +1 -1
- package/lib/teams-projects-protocol.js +21 -3
- package/lib/teams-projects-protocol.js.map +1 -1
- package/lib/typings/globals.d.ts +7 -3
- package/lib/typings/globals.d.ts.map +1 -1
- package/lib/typings/globals.js +1 -1
- package/lib/usage.d.ts +73 -0
- package/lib/usage.d.ts.map +1 -0
- package/lib/usage.js +20 -0
- package/lib/usage.js.map +1 -0
- package/lib/util/analytics.d.ts +1 -1
- package/lib/util/analytics.d.ts.map +1 -1
- package/lib/util/analytics.js +13 -4
- package/lib/util/analytics.js.map +1 -1
- package/lib/util/async-iterator.d.ts +1 -1
- package/lib/util/async-iterator.d.ts.map +1 -1
- package/lib/util/async-iterator.js +4 -4
- package/lib/util/async-iterator.js.map +1 -1
- package/lib/util/cancelable.d.ts +1 -1
- package/lib/util/cancelable.js +1 -1
- package/lib/util/cancelable.js.map +1 -1
- package/lib/util/date-time.d.ts +1 -1
- package/lib/util/date-time.js +7 -7
- package/lib/util/date-time.js.map +1 -1
- package/lib/util/debug-app.d.ts +25 -0
- package/lib/util/debug-app.d.ts.map +1 -0
- package/lib/util/debug-app.js +100 -0
- package/lib/util/debug-app.js.map +1 -0
- package/lib/util/deep-partial.d.ts +1 -1
- package/lib/util/deep-partial.js +1 -1
- package/lib/util/deferred.d.ts +1 -1
- package/lib/util/deferred.js +1 -1
- package/lib/util/deferred.js.map +1 -1
- package/lib/util/disposable.d.ts.map +1 -1
- package/lib/util/disposable.js +2 -2
- package/lib/util/disposable.js.map +1 -1
- package/lib/util/event.d.ts.map +1 -1
- package/lib/util/event.js +5 -3
- package/lib/util/event.js.map +1 -1
- package/lib/util/garbage-collected-cache.d.ts +2 -1
- package/lib/util/garbage-collected-cache.d.ts.map +1 -1
- package/lib/util/garbage-collected-cache.js +12 -3
- package/lib/util/garbage-collected-cache.js.map +1 -1
- package/lib/util/generate-workspace-id.d.ts +6 -1
- package/lib/util/generate-workspace-id.d.ts.map +1 -1
- package/lib/util/generate-workspace-id.js +461 -440
- package/lib/util/generate-workspace-id.js.map +1 -1
- package/lib/util/generate-workspace-id.spec.d.ts +1 -1
- package/lib/util/generate-workspace-id.spec.js +37 -2
- package/lib/util/generate-workspace-id.spec.js.map +1 -1
- package/lib/util/gitpod-cookie.d.ts +2 -2
- package/lib/util/gitpod-cookie.d.ts.map +1 -1
- package/lib/util/gitpod-cookie.js +1 -4
- package/lib/util/gitpod-cookie.js.map +1 -1
- package/lib/util/gitpod-host-url.d.ts +12 -5
- package/lib/util/gitpod-host-url.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.js +69 -41
- package/lib/util/gitpod-host-url.js.map +1 -1
- package/lib/util/gitpod-host-url.spec.d.ts +1 -1
- package/lib/util/gitpod-host-url.spec.d.ts.map +1 -1
- package/lib/util/gitpod-host-url.spec.js +16 -6
- package/lib/util/gitpod-host-url.spec.js.map +1 -1
- package/lib/util/grpc.d.ts +21 -1
- package/lib/util/grpc.d.ts.map +1 -1
- package/lib/util/grpc.js +74 -2
- package/lib/util/grpc.js.map +1 -1
- package/lib/util/jaeger-client-types.d.ts +68 -0
- package/lib/util/jaeger-client-types.d.ts.map +1 -0
- package/lib/{theia-plugins.js → util/jaeger-client-types.js} +2 -2
- package/lib/util/jaeger-client-types.js.map +1 -0
- package/lib/util/logging.d.ts +2 -2
- package/lib/util/logging.d.ts.map +1 -1
- package/lib/util/logging.js +32 -26
- package/lib/util/logging.js.map +1 -1
- package/lib/util/logging.spec.d.ts +7 -0
- package/lib/util/logging.spec.d.ts.map +1 -0
- package/lib/util/logging.spec.js +52 -0
- package/lib/util/logging.spec.js.map +1 -0
- package/lib/util/make-link.d.ts +1 -1
- package/lib/util/make-link.js +6 -6
- package/lib/util/make-link.js.map +1 -1
- package/lib/util/nice-grpc.d.ts +9 -0
- package/lib/util/nice-grpc.d.ts.map +1 -0
- package/lib/util/nice-grpc.js +121 -0
- package/lib/util/nice-grpc.js.map +1 -0
- package/lib/util/parse-workspace-id.d.ts +1 -1
- package/lib/util/parse-workspace-id.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.js +3 -4
- package/lib/util/parse-workspace-id.js.map +1 -1
- package/lib/util/parse-workspace-id.spec.d.ts +1 -1
- package/lib/util/parse-workspace-id.spec.d.ts.map +1 -1
- package/lib/util/parse-workspace-id.spec.js +1 -1
- package/lib/util/parse-workspace-id.spec.js.map +1 -1
- package/lib/util/queue.d.ts +1 -1
- package/lib/util/queue.js +1 -1
- package/lib/util/queue.spec.d.ts +1 -1
- package/lib/util/queue.spec.js +10 -7
- package/lib/util/queue.spec.js.map +1 -1
- package/lib/util/repeat.d.ts +15 -0
- package/lib/util/repeat.d.ts.map +1 -0
- package/lib/util/repeat.js +55 -0
- package/lib/util/repeat.js.map +1 -0
- package/lib/util/semaphore.d.ts +1 -1
- package/lib/util/semaphore.d.ts.map +1 -1
- package/lib/util/semaphore.js +1 -1
- package/lib/util/semaphore.js.map +1 -1
- package/lib/util/skip-if.d.ts +1 -1
- package/lib/util/skip-if.d.ts.map +1 -1
- package/lib/util/skip-if.js +1 -1
- package/lib/util/skip-if.js.map +1 -1
- package/lib/util/timeutil.d.ts +3 -1
- package/lib/util/timeutil.d.ts.map +1 -1
- package/lib/util/timeutil.js +16 -4
- package/lib/util/timeutil.js.map +1 -1
- package/lib/util/timeutil.spec.d.ts +3 -1
- package/lib/util/timeutil.spec.d.ts.map +1 -1
- package/lib/util/timeutil.spec.js +35 -1
- package/lib/util/timeutil.spec.js.map +1 -1
- package/lib/util/tracing.d.ts +47 -13
- package/lib/util/tracing.d.ts.map +1 -1
- package/lib/util/tracing.js +141 -32
- package/lib/util/tracing.js.map +1 -1
- package/lib/util/tracing.spec.d.ts +7 -0
- package/lib/util/tracing.spec.d.ts.map +1 -0
- package/lib/util/tracing.spec.js +121 -0
- package/lib/util/tracing.spec.js.map +1 -0
- package/lib/util/workspace-port-authentication.d.ts +8 -8
- package/lib/util/workspace-port-authentication.d.ts.map +1 -1
- package/lib/util/workspace-port-authentication.js +9 -12
- package/lib/util/workspace-port-authentication.js.map +1 -1
- package/lib/webhook-event.d.ts +44 -0
- package/lib/webhook-event.d.ts.map +1 -0
- package/lib/webhook-event.js +8 -0
- package/lib/webhook-event.js.map +1 -0
- package/lib/workspace-class.d.ts +14 -0
- package/lib/workspace-class.d.ts.map +1 -0
- package/lib/workspace-class.js +8 -0
- package/lib/workspace-class.js.map +1 -0
- package/lib/workspace-cluster.d.ts +24 -18
- package/lib/workspace-cluster.d.ts.map +1 -1
- package/lib/workspace-cluster.js +22 -2
- package/lib/workspace-cluster.js.map +1 -1
- package/lib/workspace-instance.d.ts +41 -4
- package/lib/workspace-instance.d.ts.map +1 -1
- package/lib/workspace-instance.js +1 -1
- package/lib/wsready.d.ts +8 -2
- package/lib/wsready.d.ts.map +1 -1
- package/lib/wsready.js +3 -3
- package/package.json +18 -8
- package/pkg-yarn.lock +11 -6
- package/provenance-bundle.jsonl +2 -0
- package/src/accounting-protocol.ts +76 -52
- package/src/admin-protocol.ts +59 -19
- package/src/analytics.ts +27 -29
- package/src/attribution.ts +67 -0
- package/src/auth.ts +3 -3
- package/src/billing-mode.ts +84 -0
- package/src/blocked-repositories-protocol.ts +13 -0
- package/src/context-url.spec.ts +25 -15
- package/src/context-url.ts +93 -37
- package/src/encryption/container-module.ts +3 -4
- package/src/encryption/encryption-engine.spec.ts +10 -9
- package/src/encryption/encryption-engine.ts +21 -17
- package/src/encryption/encryption-service.ts +5 -6
- package/src/encryption/key-provider.ts +17 -20
- package/src/env.ts +2 -25
- package/src/experiments/always-default.ts +24 -0
- package/src/experiments/configcat-server.ts +42 -0
- package/src/experiments/configcat.ts +56 -0
- package/src/experiments/types.ts +34 -0
- package/src/frontend-dashboard-service.ts +148 -0
- package/src/gitpod-file-parser.spec.ts +56 -62
- package/src/gitpod-file-parser.ts +17 -18
- package/src/gitpod-service.ts +315 -136
- package/src/headless-workspace-log.ts +7 -5
- package/src/ide-frontend-service.ts +3 -3
- package/src/ide-protocol.ts +63 -8
- package/src/index.ts +17 -15
- package/src/installation-admin-protocol.ts +45 -0
- package/src/license-protocol.ts +13 -7
- package/src/messaging/browser/connection.ts +45 -47
- package/src/messaging/browser/window-connection.ts +40 -30
- package/src/messaging/client-call-metrics.ts +79 -82
- package/src/messaging/error.ts +37 -8
- package/src/messaging/handler.ts +6 -6
- package/src/messaging/node/connection.ts +23 -70
- package/src/messaging/proxy-factory.ts +23 -30
- package/src/oss-allowlist.ts +15 -0
- package/src/payment-protocol.ts +3 -3
- package/src/permission.ts +45 -33
- package/src/plans.ts +257 -190
- package/src/protocol.spec.ts +97 -0
- package/src/protocol.ts +650 -305
- package/src/snapshot-url.spec.ts +10 -8
- package/src/snapshot-url.ts +1 -1
- package/src/team-subscription-protocol.ts +63 -23
- package/src/teams-projects-protocol.ts +60 -12
- package/src/typings/globals.ts +12 -5
- package/src/usage.ts +85 -0
- package/src/util/analytics.ts +47 -25
- package/src/util/async-iterator.ts +5 -6
- package/src/util/cancelable.ts +4 -4
- package/src/util/date-time.ts +9 -9
- package/src/util/debug-app.ts +81 -0
- package/src/util/deep-partial.ts +1 -1
- package/src/util/deferred.ts +7 -7
- package/src/util/disposable.ts +3 -6
- package/src/util/event.ts +9 -11
- package/src/util/garbage-collected-cache.ts +15 -7
- package/src/util/generate-workspace-id.spec.ts +35 -8
- package/src/util/generate-workspace-id.ts +465 -441
- package/src/util/gitpod-cookie.ts +9 -10
- package/src/util/gitpod-host-url.spec.ts +41 -14
- package/src/util/gitpod-host-url.ts +81 -46
- package/src/util/grpc.ts +94 -2
- package/src/util/jaeger-client-types.ts +102 -0
- package/src/util/logging.spec.ts +23 -0
- package/src/util/logging.ts +61 -43
- package/src/util/make-link.ts +7 -8
- package/src/util/nice-grpc.ts +96 -0
- package/src/util/parse-workspace-id.spec.ts +18 -9
- package/src/util/parse-workspace-id.ts +7 -8
- package/src/util/queue.spec.ts +28 -26
- package/src/util/queue.ts +1 -1
- package/src/util/repeat.ts +45 -0
- package/src/util/semaphore.ts +5 -7
- package/src/util/skip-if.ts +10 -7
- package/src/util/timeutil.spec.ts +41 -15
- package/src/util/timeutil.ts +28 -12
- package/src/util/tracing.spec.ts +88 -0
- package/src/util/tracing.ts +175 -59
- package/src/util/workspace-port-authentication.ts +11 -14
- package/src/webhook-event.ts +55 -0
- package/src/workspace-class.ts +14 -0
- package/src/workspace-cluster.ts +46 -21
- package/src/workspace-instance.ts +84 -22
- package/src/wsready.ts +11 -4
- package/data/builtin-theia-plugins.json +0 -372
- package/lib/email-protocol.d.ts +0 -49
- package/lib/email-protocol.d.ts.map +0 -1
- package/lib/email-protocol.js +0 -28
- package/lib/email-protocol.js.map +0 -1
- package/lib/messaging/connection-error-handler.d.ts +0 -27
- package/lib/messaging/connection-error-handler.d.ts.map +0 -1
- package/lib/messaging/connection-error-handler.js +0 -34
- package/lib/messaging/connection-error-handler.js.map +0 -1
- package/lib/theia-plugins.d.ts +0 -11
- package/lib/theia-plugins.d.ts.map +0 -1
- package/lib/theia-plugins.js.map +0 -1
- package/lib/util/repeater.d.ts +0 -22
- package/lib/util/repeater.d.ts.map +0 -1
- package/lib/util/repeater.js +0 -65
- package/lib/util/repeater.js.map +0 -1
- package/lib/util/safe-promise.d.ts +0 -11
- package/lib/util/safe-promise.d.ts.map +0 -1
- package/lib/util/safe-promise.js +0 -31
- package/lib/util/safe-promise.js.map +0 -1
- package/src/email-protocol.ts +0 -66
- package/src/messaging/connection-error-handler.ts +0 -62
- package/src/theia-plugins.ts +0 -11
- package/src/util/jaeger-client.d.ts +0 -105
- package/src/util/repeater.ts +0 -49
- package/src/util/safe-promise.ts +0 -26
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Copyright (c) 2021 Gitpod GmbH. All rights reserved.
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
-
* See License
|
|
4
|
+
* See License.AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
|
-
import * as cookie from
|
|
7
|
-
|
|
6
|
+
import * as cookie from "cookie";
|
|
8
7
|
|
|
9
8
|
/**
|
|
10
9
|
* This cookie indicates whether the connected client is a Gitpod user (= "has logged in within the last year") or not.
|
|
@@ -20,20 +19,20 @@ export const VALUE = "true";
|
|
|
20
19
|
export function options(domain: string): cookie.CookieSerializeOptions {
|
|
21
20
|
// Reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies
|
|
22
21
|
return {
|
|
23
|
-
path: "/",
|
|
22
|
+
path: "/", // make sure we send the cookie to all sub-pages
|
|
24
23
|
httpOnly: false,
|
|
25
24
|
secure: false,
|
|
26
|
-
maxAge: 60 * 60 * 24 * 365,
|
|
27
|
-
sameSite: "lax",
|
|
28
|
-
domain: `.${domain}`,
|
|
25
|
+
maxAge: 60 * 60 * 24 * 365, // 1 year
|
|
26
|
+
sameSite: "lax", // default: true. "Lax" needed to ensure we see cookies from users that neavigate to gitpod.io from external sites
|
|
27
|
+
domain: `.${domain}`, // explicilty include subdomains to not only cover "gitpod.io", but also "www.gitpod.io" or workspaces
|
|
29
28
|
};
|
|
30
|
-
}
|
|
29
|
+
}
|
|
31
30
|
|
|
32
31
|
export function generateCookie(domain: string): string {
|
|
33
32
|
return cookie.serialize(NAME, VALUE, options(domain));
|
|
34
|
-
}
|
|
33
|
+
}
|
|
35
34
|
|
|
36
35
|
export function isPresent(cookies: string): boolean {
|
|
37
36
|
// needs to match the old (gitpod-user=loggedIn) and new (gitpod-user=true) values to ensure a smooth transition during rollout.
|
|
38
37
|
return !!cookies.match(`${NAME}=`);
|
|
39
|
-
}
|
|
38
|
+
}
|
|
@@ -1,49 +1,76 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
-
* See License
|
|
4
|
+
* See License.AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import * as chai from
|
|
8
|
-
import { suite, test } from
|
|
9
|
-
import { GitpodHostUrl } from
|
|
7
|
+
import * as chai from "chai";
|
|
8
|
+
import { suite, test } from "mocha-typescript";
|
|
9
|
+
import { GitpodHostUrl } from "./gitpod-host-url";
|
|
10
10
|
const expect = chai.expect;
|
|
11
11
|
|
|
12
12
|
@suite
|
|
13
13
|
export class GitpodHostUrlTest {
|
|
14
|
-
|
|
15
14
|
@test public parseWorkspaceId_pathBased() {
|
|
16
|
-
const actual = GitpodHostUrl.fromWorkspaceUrl(
|
|
15
|
+
const actual = GitpodHostUrl.fromWorkspaceUrl(
|
|
16
|
+
"http://35.223.201.195/workspace/bc77e03d-c781-4235-bca0-e24087f5e472/",
|
|
17
|
+
).workspaceId;
|
|
17
18
|
expect(actual).to.equal("bc77e03d-c781-4235-bca0-e24087f5e472");
|
|
18
19
|
}
|
|
19
20
|
|
|
20
21
|
@test public parseWorkspaceId_hosts_withEnvVarsInjected() {
|
|
21
|
-
const actual = GitpodHostUrl.fromWorkspaceUrl(
|
|
22
|
+
const actual = GitpodHostUrl.fromWorkspaceUrl(
|
|
23
|
+
"https://gray-grasshopper-nfbitfia.ws-eu02.gitpod-staging.com/#passedin=test%20value/https://github.com/gitpod-io/gitpod-test-repo",
|
|
24
|
+
).workspaceId;
|
|
22
25
|
expect(actual).to.equal("gray-grasshopper-nfbitfia");
|
|
23
26
|
}
|
|
24
27
|
|
|
25
28
|
@test public async testWithoutWorkspacePrefix() {
|
|
26
|
-
expect(
|
|
29
|
+
expect(
|
|
30
|
+
GitpodHostUrl.fromWorkspaceUrl("https://3000-moccasin-ferret-155799b3.ws-eu02.gitpod-staging.com/")
|
|
31
|
+
.withoutWorkspacePrefix()
|
|
32
|
+
.toString(),
|
|
33
|
+
).to.equal("https://gitpod-staging.com/");
|
|
27
34
|
}
|
|
28
35
|
|
|
29
36
|
@test public async testWithoutWorkspacePrefix2() {
|
|
30
|
-
expect(
|
|
37
|
+
expect(
|
|
38
|
+
GitpodHostUrl.fromWorkspaceUrl("https://gitpod-staging.com/").withoutWorkspacePrefix().toString(),
|
|
39
|
+
).to.equal("https://gitpod-staging.com/");
|
|
31
40
|
}
|
|
32
41
|
|
|
33
42
|
@test public async testWithoutWorkspacePrefix3() {
|
|
34
|
-
expect(
|
|
43
|
+
expect(
|
|
44
|
+
GitpodHostUrl.fromWorkspaceUrl("https://gray-rook-5523v5d8.ws-dev.my-branch-1234.staging.gitpod-dev.com/")
|
|
45
|
+
.withoutWorkspacePrefix()
|
|
46
|
+
.toString(),
|
|
47
|
+
).to.equal("https://my-branch-1234.staging.gitpod-dev.com/");
|
|
35
48
|
}
|
|
36
49
|
|
|
37
50
|
@test public async testWithoutWorkspacePrefix4() {
|
|
38
|
-
expect(
|
|
51
|
+
expect(
|
|
52
|
+
GitpodHostUrl.fromWorkspaceUrl("https://my-branch-1234.staging.gitpod-dev.com/")
|
|
53
|
+
.withoutWorkspacePrefix()
|
|
54
|
+
.toString(),
|
|
55
|
+
).to.equal("https://my-branch-1234.staging.gitpod-dev.com/");
|
|
39
56
|
}
|
|
40
57
|
|
|
41
58
|
@test public async testWithoutWorkspacePrefix5() {
|
|
42
|
-
expect(
|
|
59
|
+
expect(
|
|
60
|
+
GitpodHostUrl.fromWorkspaceUrl("https://abc-nice-brunch-4224.staging.gitpod-dev.com/")
|
|
61
|
+
.withoutWorkspacePrefix()
|
|
62
|
+
.toString(),
|
|
63
|
+
).to.equal("https://abc-nice-brunch-4224.staging.gitpod-dev.com/");
|
|
43
64
|
}
|
|
44
65
|
|
|
45
66
|
@test public async testWithoutWorkspacePrefix6() {
|
|
46
|
-
expect(
|
|
67
|
+
expect(
|
|
68
|
+
GitpodHostUrl.fromWorkspaceUrl(
|
|
69
|
+
"https://gray-rook-5523v5d8.ws-dev.abc-nice-brunch-4224.staging.gitpod-dev.com/",
|
|
70
|
+
)
|
|
71
|
+
.withoutWorkspacePrefix()
|
|
72
|
+
.toString(),
|
|
73
|
+
).to.equal("https://abc-nice-brunch-4224.staging.gitpod-dev.com/");
|
|
47
74
|
}
|
|
48
75
|
}
|
|
49
|
-
module.exports = new GitpodHostUrlTest()
|
|
76
|
+
module.exports = new GitpodHostUrlTest();
|
|
@@ -1,38 +1,39 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
-
* See License
|
|
4
|
+
* See License.AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
const URL = require(
|
|
8
|
-
import { log } from
|
|
7
|
+
const URL = require("url").URL || window.URL;
|
|
8
|
+
import { log } from "./logging";
|
|
9
9
|
|
|
10
10
|
export interface UrlChange {
|
|
11
|
-
(old: URL): Partial<URL
|
|
11
|
+
(old: URL): Partial<URL>;
|
|
12
12
|
}
|
|
13
13
|
export type UrlUpdate = UrlChange | Partial<URL>;
|
|
14
14
|
|
|
15
|
-
const
|
|
15
|
+
const baseWorkspaceIDRegex =
|
|
16
|
+
"(([a-f][0-9a-f]{7}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|([0-9a-z]{2,16}-[0-9a-z]{2,16}-[0-9a-z]{8,11}))";
|
|
16
17
|
|
|
17
18
|
// this pattern matches v4 UUIDs as well as the new generated workspace ids (e.g. pink-panda-ns35kd21)
|
|
18
|
-
const workspaceIDRegex = RegExp(
|
|
19
|
+
const workspaceIDRegex = RegExp(`^(?:debug-)?${baseWorkspaceIDRegex}$`);
|
|
19
20
|
|
|
20
21
|
// this pattern matches URL prefixes of workspaces
|
|
21
|
-
const workspaceUrlPrefixRegex = RegExp(`^([0-9]{4,6}-)?${
|
|
22
|
+
const workspaceUrlPrefixRegex = RegExp(`^(([0-9]{4,6}|debug)-)?${baseWorkspaceIDRegex}\\.`);
|
|
22
23
|
|
|
23
24
|
export class GitpodHostUrl {
|
|
24
25
|
readonly url: URL;
|
|
25
26
|
|
|
26
27
|
constructor(urlParam?: string | URL) {
|
|
27
|
-
if (urlParam === undefined || typeof urlParam ===
|
|
28
|
-
this.url = new URL(urlParam ||
|
|
29
|
-
this.url.search =
|
|
30
|
-
this.url.hash =
|
|
31
|
-
this.url.pathname =
|
|
28
|
+
if (urlParam === undefined || typeof urlParam === "string") {
|
|
29
|
+
this.url = new URL(urlParam || "https://gitpod.io");
|
|
30
|
+
this.url.search = "";
|
|
31
|
+
this.url.hash = "";
|
|
32
|
+
this.url.pathname = "";
|
|
32
33
|
} else if (urlParam instanceof URL) {
|
|
33
34
|
this.url = urlParam;
|
|
34
35
|
} else {
|
|
35
|
-
log.error(
|
|
36
|
+
log.error("Unexpected urlParam", { urlParam });
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
39
|
|
|
@@ -45,7 +46,7 @@ export class GitpodHostUrl {
|
|
|
45
46
|
}
|
|
46
47
|
|
|
47
48
|
withDomainPrefix(prefix: string): GitpodHostUrl {
|
|
48
|
-
return this.with(url => ({ host: prefix + url.host }))
|
|
49
|
+
return this.with((url) => ({ host: prefix + url.host }));
|
|
49
50
|
}
|
|
50
51
|
|
|
51
52
|
withoutWorkspacePrefix(): GitpodHostUrl {
|
|
@@ -58,14 +59,14 @@ export class GitpodHostUrl {
|
|
|
58
59
|
}
|
|
59
60
|
|
|
60
61
|
withoutDomainPrefix(removeSegmentsCount: number): GitpodHostUrl {
|
|
61
|
-
return this.with(url => ({ host: url.host.split(
|
|
62
|
+
return this.with((url) => ({ host: url.host.split(".").splice(removeSegmentsCount).join(".") }));
|
|
62
63
|
}
|
|
63
64
|
|
|
64
65
|
with(urlUpdate: UrlUpdate) {
|
|
65
|
-
const update = typeof urlUpdate ===
|
|
66
|
-
const addSlashToPath = update.pathname && update.pathname.length > 0 && !update.pathname.startsWith(
|
|
66
|
+
const update = typeof urlUpdate === "function" ? urlUpdate(this.url) : urlUpdate;
|
|
67
|
+
const addSlashToPath = update.pathname && update.pathname.length > 0 && !update.pathname.startsWith("/");
|
|
67
68
|
if (addSlashToPath) {
|
|
68
|
-
update.pathname =
|
|
69
|
+
update.pathname = "/" + update.pathname;
|
|
69
70
|
}
|
|
70
71
|
const result = Object.assign(new URL(this.toString()), update);
|
|
71
72
|
return new GitpodHostUrl(result);
|
|
@@ -73,54 +74,63 @@ export class GitpodHostUrl {
|
|
|
73
74
|
|
|
74
75
|
withApi(urlUpdate?: UrlUpdate) {
|
|
75
76
|
const updated = urlUpdate ? this.with(urlUpdate) : this;
|
|
76
|
-
return updated.with(url => ({ pathname: `/api${url.pathname}` }));
|
|
77
|
+
return updated.with((url) => ({ pathname: `/api${url.pathname}` }));
|
|
77
78
|
}
|
|
78
79
|
|
|
79
|
-
withContext(
|
|
80
|
-
|
|
80
|
+
withContext(
|
|
81
|
+
contextUrl: string,
|
|
82
|
+
startOptions?: { showOptions?: boolean; editor?: string; workspaceClass?: string },
|
|
83
|
+
) {
|
|
84
|
+
const searchParams = new URLSearchParams();
|
|
85
|
+
if (startOptions?.showOptions) {
|
|
86
|
+
searchParams.append("showOptions", "true");
|
|
87
|
+
}
|
|
88
|
+
return this.with((url) => ({ hash: contextUrl, search: searchParams.toString() }));
|
|
81
89
|
}
|
|
82
90
|
|
|
83
91
|
asWebsocket(): GitpodHostUrl {
|
|
84
|
-
return this.with(url => ({ protocol: url.protocol ===
|
|
92
|
+
return this.with((url) => ({ protocol: url.protocol === "https:" ? "wss:" : "ws:" }));
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
asWorkspacePage(): GitpodHostUrl {
|
|
96
|
+
return this.with((url) => ({ pathname: "/workspaces" }));
|
|
85
97
|
}
|
|
86
98
|
|
|
87
99
|
asDashboard(): GitpodHostUrl {
|
|
88
|
-
return this.with(url => ({ pathname:
|
|
100
|
+
return this.with((url) => ({ pathname: "/" }));
|
|
89
101
|
}
|
|
90
102
|
|
|
91
|
-
|
|
92
|
-
return this.with(url => ({ pathname:
|
|
103
|
+
asBilling(): GitpodHostUrl {
|
|
104
|
+
return this.with((url) => ({ pathname: "/user/billing" }));
|
|
93
105
|
}
|
|
94
106
|
|
|
95
|
-
|
|
96
|
-
return this.with(url => ({ pathname:
|
|
107
|
+
asLogin(): GitpodHostUrl {
|
|
108
|
+
return this.with((url) => ({ pathname: "/login" }));
|
|
97
109
|
}
|
|
98
110
|
|
|
99
111
|
asAccessControl(): GitpodHostUrl {
|
|
100
|
-
return this.with(url => ({ pathname:
|
|
112
|
+
return this.with((url) => ({ pathname: "/integrations" }));
|
|
101
113
|
}
|
|
102
114
|
|
|
103
115
|
asSettings(): GitpodHostUrl {
|
|
104
|
-
return this.with(url => ({ pathname:
|
|
116
|
+
return this.with((url) => ({ pathname: "/user/account" }));
|
|
105
117
|
}
|
|
106
118
|
|
|
107
119
|
asPreferences(): GitpodHostUrl {
|
|
108
|
-
return this.with(url => ({ pathname:
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
asGraphQLApi(): GitpodHostUrl {
|
|
112
|
-
return this.with(url => ({ pathname: '/graphql/' }));
|
|
120
|
+
return this.with((url) => ({ pathname: "/user/preferences" }));
|
|
113
121
|
}
|
|
114
122
|
|
|
115
123
|
asStart(workspaceId = this.workspaceId): GitpodHostUrl {
|
|
116
124
|
return this.withoutWorkspacePrefix().with({
|
|
117
|
-
pathname:
|
|
118
|
-
hash:
|
|
125
|
+
pathname: "/start/",
|
|
126
|
+
hash: "#" + workspaceId,
|
|
119
127
|
});
|
|
120
128
|
}
|
|
121
129
|
|
|
122
|
-
asWorkspaceAuth(instanceID: string
|
|
123
|
-
return this.with(url => ({
|
|
130
|
+
asWorkspaceAuth(instanceID: string): GitpodHostUrl {
|
|
131
|
+
return this.with((url) => ({
|
|
132
|
+
pathname: `/api/auth/workspace-cookie/${instanceID}`,
|
|
133
|
+
}));
|
|
124
134
|
}
|
|
125
135
|
|
|
126
136
|
toString() {
|
|
@@ -129,12 +139,16 @@ export class GitpodHostUrl {
|
|
|
129
139
|
|
|
130
140
|
toStringWoRootSlash() {
|
|
131
141
|
let result = this.toString();
|
|
132
|
-
if (result.endsWith(
|
|
142
|
+
if (result.endsWith("/")) {
|
|
133
143
|
result = result.slice(0, result.length - 1);
|
|
134
144
|
}
|
|
135
145
|
return result;
|
|
136
146
|
}
|
|
137
147
|
|
|
148
|
+
get debugWorkspace(): boolean {
|
|
149
|
+
return this.url.host.match(workspaceUrlPrefixRegex)?.[2] === "debug";
|
|
150
|
+
}
|
|
151
|
+
|
|
138
152
|
get workspaceId(): string | undefined {
|
|
139
153
|
const hostSegs = this.url.host.split(".");
|
|
140
154
|
if (hostSegs.length > 1) {
|
|
@@ -142,34 +156,55 @@ export class GitpodHostUrl {
|
|
|
142
156
|
if (matchResults) {
|
|
143
157
|
// URL has a workspace prefix
|
|
144
158
|
// port prefixes are excluded
|
|
145
|
-
return matchResults[
|
|
159
|
+
return matchResults[1];
|
|
146
160
|
}
|
|
147
161
|
}
|
|
148
162
|
|
|
149
|
-
const pathSegs = this.url.pathname.split("/")
|
|
163
|
+
const pathSegs = this.url.pathname.split("/");
|
|
150
164
|
if (pathSegs.length > 3 && pathSegs[1] === "workspace") {
|
|
151
165
|
return pathSegs[2];
|
|
152
166
|
}
|
|
153
167
|
|
|
168
|
+
const cleanHash = this.url.hash.replace(/^#/, "");
|
|
169
|
+
if (this.url.pathname == "/start/" && cleanHash.match(workspaceIDRegex)) {
|
|
170
|
+
return cleanHash;
|
|
171
|
+
}
|
|
172
|
+
|
|
154
173
|
return undefined;
|
|
155
174
|
}
|
|
156
175
|
|
|
157
|
-
get blobServe(): boolean
|
|
176
|
+
get blobServe(): boolean {
|
|
158
177
|
const hostSegments = this.url.host.split(".");
|
|
159
|
-
if (hostSegments[0] ===
|
|
178
|
+
if (hostSegments[0] === "blobserve") {
|
|
160
179
|
return true;
|
|
161
180
|
}
|
|
162
181
|
|
|
163
|
-
const pathSegments = this.url.pathname.split("/")
|
|
182
|
+
const pathSegments = this.url.pathname.split("/");
|
|
164
183
|
return pathSegments[0] === "blobserve";
|
|
165
184
|
}
|
|
166
185
|
|
|
167
186
|
asSorry(message: string) {
|
|
168
|
-
return this.with({ pathname:
|
|
187
|
+
return this.with({ pathname: "/sorry", hash: message });
|
|
169
188
|
}
|
|
170
189
|
|
|
171
190
|
asApiLogout(): GitpodHostUrl {
|
|
172
|
-
return this.withApi(url => ({ pathname:
|
|
191
|
+
return this.withApi((url) => ({ pathname: "/logout/" }));
|
|
173
192
|
}
|
|
174
193
|
|
|
194
|
+
asIDEProxy(): GitpodHostUrl {
|
|
195
|
+
const hostSegments = this.url.host.split(".");
|
|
196
|
+
if (hostSegments[0] === "ide") {
|
|
197
|
+
return this;
|
|
198
|
+
}
|
|
199
|
+
return this.with((url) => ({ host: "ide." + url.host }));
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
asIDEMetrics(): GitpodHostUrl {
|
|
203
|
+
let newUrl: GitpodHostUrl = this;
|
|
204
|
+
const hostSegments = this.url.host.split(".");
|
|
205
|
+
if (hostSegments[0] !== "ide") {
|
|
206
|
+
newUrl = newUrl.asIDEProxy();
|
|
207
|
+
}
|
|
208
|
+
return newUrl.with((url) => ({ pathname: "/metrics-api" }));
|
|
209
|
+
}
|
|
175
210
|
}
|
package/src/util/grpc.ts
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Copyright (c) 2021 Gitpod GmbH. All rights reserved.
|
|
3
3
|
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
-
* See License
|
|
4
|
+
* See License.AGPL.txt in the project root for license information.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
import * as grpc from "@grpc/grpc-js";
|
|
8
|
+
import { Status } from "@grpc/grpc-js/build/src/constants";
|
|
9
|
+
|
|
10
|
+
export const defaultGRPCOptions = {
|
|
8
11
|
"grpc.keepalive_timeout_ms": 10000,
|
|
9
12
|
"grpc.keepalive_time_ms": 60000,
|
|
10
13
|
"grpc.http2.min_time_between_pings_ms": 10000,
|
|
@@ -13,3 +16,92 @@
|
|
|
13
16
|
"grpc.max_reconnect_backoff_ms": 5000,
|
|
14
17
|
"grpc.max_receive_message_length": 1024 * 1024 * 16,
|
|
15
18
|
};
|
|
19
|
+
|
|
20
|
+
export type GrpcMethodType = "unary" | "client_stream" | "server_stream" | "bidi_stream";
|
|
21
|
+
|
|
22
|
+
export interface IGrpcCallMetricsLabels {
|
|
23
|
+
service: string;
|
|
24
|
+
method: string;
|
|
25
|
+
type: GrpcMethodType;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export interface IGrpcCallMetricsLabelsWithCode extends IGrpcCallMetricsLabels {
|
|
29
|
+
code: string;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export const IClientCallMetrics = Symbol("IClientCallMetrics");
|
|
33
|
+
|
|
34
|
+
export interface IClientCallMetrics {
|
|
35
|
+
started(labels: IGrpcCallMetricsLabels): void;
|
|
36
|
+
sent(labels: IGrpcCallMetricsLabels): void;
|
|
37
|
+
received(labels: IGrpcCallMetricsLabels): void;
|
|
38
|
+
handled(labels: IGrpcCallMetricsLabelsWithCode): void;
|
|
39
|
+
startHandleTimer(
|
|
40
|
+
labels: IGrpcCallMetricsLabels,
|
|
41
|
+
): (labels?: Partial<Record<string, string | number>> | undefined) => number;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export function getGrpcMethodType(requestStream: boolean, responseStream: boolean): GrpcMethodType {
|
|
45
|
+
if (requestStream) {
|
|
46
|
+
if (responseStream) {
|
|
47
|
+
return "bidi_stream";
|
|
48
|
+
} else {
|
|
49
|
+
return "client_stream";
|
|
50
|
+
}
|
|
51
|
+
} else {
|
|
52
|
+
if (responseStream) {
|
|
53
|
+
return "server_stream";
|
|
54
|
+
} else {
|
|
55
|
+
return "unary";
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export function createClientCallMetricsInterceptor(metrics: IClientCallMetrics): grpc.Interceptor {
|
|
61
|
+
return (options, nextCall): grpc.InterceptingCall => {
|
|
62
|
+
const methodDef = options.method_definition;
|
|
63
|
+
const method = methodDef.path.substring(methodDef.path.lastIndexOf("/") + 1);
|
|
64
|
+
const service = methodDef.path.substring(1, methodDef.path.length - method.length - 1);
|
|
65
|
+
const labels = {
|
|
66
|
+
service,
|
|
67
|
+
method,
|
|
68
|
+
type: getGrpcMethodType(options.method_definition.requestStream, options.method_definition.responseStream),
|
|
69
|
+
};
|
|
70
|
+
const requester = new grpc.RequesterBuilder()
|
|
71
|
+
.withStart((metadata, listener, next) => {
|
|
72
|
+
const newListener = new grpc.ListenerBuilder()
|
|
73
|
+
.withOnReceiveStatus((status, next) => {
|
|
74
|
+
try {
|
|
75
|
+
metrics.handled({
|
|
76
|
+
...labels,
|
|
77
|
+
code: Status[status.code],
|
|
78
|
+
});
|
|
79
|
+
} finally {
|
|
80
|
+
next(status);
|
|
81
|
+
}
|
|
82
|
+
})
|
|
83
|
+
.withOnReceiveMessage((message, next) => {
|
|
84
|
+
try {
|
|
85
|
+
metrics.received(labels);
|
|
86
|
+
} finally {
|
|
87
|
+
next(message);
|
|
88
|
+
}
|
|
89
|
+
})
|
|
90
|
+
.build();
|
|
91
|
+
try {
|
|
92
|
+
metrics.started(labels);
|
|
93
|
+
} finally {
|
|
94
|
+
next(metadata, newListener);
|
|
95
|
+
}
|
|
96
|
+
})
|
|
97
|
+
.withSendMessage((message, next) => {
|
|
98
|
+
try {
|
|
99
|
+
metrics.sent(labels);
|
|
100
|
+
} finally {
|
|
101
|
+
next(message);
|
|
102
|
+
}
|
|
103
|
+
})
|
|
104
|
+
.build();
|
|
105
|
+
return new grpc.InterceptingCall(nextCall(options), requester);
|
|
106
|
+
};
|
|
107
|
+
}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2020 Gitpod GmbH. All rights reserved.
|
|
3
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
+
* See License.AGPL.txt in the project root for license information.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import { opentracing } from "jaeger-client";
|
|
8
|
+
|
|
9
|
+
// Type definitions for jaeger-client which are not exported by @types/jaeger-client
|
|
10
|
+
// Project: https://github.com/uber/jaeger-client-node
|
|
11
|
+
// Definitions by: Julian Steger <https://github.com/julianste>
|
|
12
|
+
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
|
|
13
|
+
|
|
14
|
+
export interface TracingConfig {
|
|
15
|
+
serviceName?: string;
|
|
16
|
+
disable?: boolean;
|
|
17
|
+
sampler?: SamplerConfig;
|
|
18
|
+
reporter?: ReporterConfig;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export interface TracingOptions {
|
|
22
|
+
reporter?: Reporter;
|
|
23
|
+
metrics?: MetricsFactory;
|
|
24
|
+
logger?: Logger;
|
|
25
|
+
tags?: any;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export interface ReporterConfig {
|
|
29
|
+
logSpans?: boolean;
|
|
30
|
+
agentHost?: string;
|
|
31
|
+
agentPort?: number;
|
|
32
|
+
flushIntervalMs?: number;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export interface SamplerConfig {
|
|
36
|
+
type: string;
|
|
37
|
+
param: number;
|
|
38
|
+
host?: string;
|
|
39
|
+
port?: number;
|
|
40
|
+
refreshIntervalMs?: number;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export interface Logger {
|
|
44
|
+
info(msg: string): void;
|
|
45
|
+
error(msg: string): void;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export interface Reporter {
|
|
49
|
+
report(span: opentracing.Span): void;
|
|
50
|
+
close(callback?: () => void): void;
|
|
51
|
+
setProcess(serviceName: string, tags: any): void;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export interface MetricsFactory {
|
|
55
|
+
createCounter(name: string, tags: any): Counter;
|
|
56
|
+
createTimer(name: string, tags: any): Timer;
|
|
57
|
+
createGauge(name: string, tags: any): Gauge;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
// Counter tracks the number of times an event has occurred
|
|
61
|
+
export interface Counter {
|
|
62
|
+
// Adds the given value to the counter.
|
|
63
|
+
increment(delta: number): void;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
// Timer tracks how long an operation took and also computes percentiles.
|
|
67
|
+
export interface Timer {
|
|
68
|
+
// Records the time passed in.
|
|
69
|
+
record(value: number): void;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
// Gauge returns instantaneous measurements of something as an int64 value
|
|
73
|
+
export interface Gauge {
|
|
74
|
+
// Update the gauge to the value passed in.
|
|
75
|
+
update(value: number): void;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
// export function initTracer(
|
|
79
|
+
// tracingConfig: TracingConfig,
|
|
80
|
+
// tracingOptions: TracingOptions,
|
|
81
|
+
// ): opentracing.Tracer;
|
|
82
|
+
|
|
83
|
+
// export function initTracerFromEnv(
|
|
84
|
+
// tracingConfig: TracingConfig,
|
|
85
|
+
// tracingOptions: TracingOptions,
|
|
86
|
+
// ): opentracing.Tracer;
|
|
87
|
+
|
|
88
|
+
export interface SamplingDecision {
|
|
89
|
+
sample: boolean;
|
|
90
|
+
retryable: boolean;
|
|
91
|
+
tags: any;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
// added by TypeFox
|
|
95
|
+
export interface Sampler {
|
|
96
|
+
name(): string;
|
|
97
|
+
isSampled(operation: string, tags: any): boolean;
|
|
98
|
+
onCreateSpan(span: opentracing.Span): SamplingDecision;
|
|
99
|
+
onSetOperationName(span: opentracing.Span, operationName: string): SamplingDecision;
|
|
100
|
+
onSetTag(span: opentracing.Span, key: string, value: any): SamplingDecision;
|
|
101
|
+
close(callback: () => void): void;
|
|
102
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2021 Gitpod GmbH. All rights reserved.
|
|
3
|
+
* Licensed under the GNU Affero General Public License (AGPL).
|
|
4
|
+
* See License.AGPL.txt in the project root for license information.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
import { suite, test } from "mocha-typescript";
|
|
8
|
+
import { log } from "./logging";
|
|
9
|
+
|
|
10
|
+
@suite
|
|
11
|
+
class TestLogging {
|
|
12
|
+
@test public async testLogInfo_output() {
|
|
13
|
+
const testObj = {
|
|
14
|
+
null: null,
|
|
15
|
+
undefined: undefined,
|
|
16
|
+
empty: "",
|
|
17
|
+
foo: "bar",
|
|
18
|
+
number: 0,
|
|
19
|
+
};
|
|
20
|
+
log.info("info logging test", testObj);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
module.exports = new TestLogging();
|