construct-hub 0.4.3 → 0.4.6
Sign up to get free protection for your applications and to get access to all the features.
- package/.jsii +119 -57
- package/API.md +50 -4
- package/changelog.md +3 -3
- package/docs/operator-runbook.md +32 -0
- package/lib/backend/catalog-builder/index.js +5 -1
- package/lib/construct-hub.d.ts +19 -0
- package/lib/construct-hub.js +37 -12
- package/lib/monitoring/api.d.ts +3 -3
- package/lib/monitoring/api.js +1 -1
- package/lib/monitoring/index.d.ts +4 -4
- package/lib/monitoring/index.js +5 -5
- package/lib/package-sources/code-artifact.js +1 -1
- package/lib/package-sources/npmjs/canary/constants.d.ts +8 -1
- package/lib/package-sources/npmjs/canary/constants.js +1 -1
- package/lib/package-sources/npmjs/canary/index.d.ts +16 -0
- package/lib/package-sources/npmjs/canary/index.js +35 -4
- package/lib/package-sources/npmjs/canary/npmjs-package-canary.lambda.bundle/index.js +20 -1
- package/lib/package-sources/npmjs/canary/npmjs-package-canary.lambda.bundle/index.js.map +2 -2
- package/lib/package-sources/npmjs/canary/npmjs-package-canary.lambda.d.ts +58 -0
- package/lib/package-sources/npmjs/canary/npmjs-package-canary.lambda.js +24 -3
- package/lib/package-sources/npmjs.js +64 -8
- package/lib/package-tag/index.js +3 -3
- package/lib/package-tag-group/index.js +2 -2
- package/lib/preload-file/index.js +1 -1
- package/lib/s3/storage.js +1 -1
- package/lib/spdx-license.js +1 -1
- package/package.json +1 -1
- package/releasetag.txt +1 -1
- package/version.txt +1 -1
package/lib/monitoring/index.js
CHANGED
@@ -35,7 +35,7 @@ class Monitoring extends constructs_1.Construct {
|
|
35
35
|
* @param alarm
|
36
36
|
*/
|
37
37
|
addHighSeverityAlarm(title, alarm) {
|
38
|
-
var _a, _b
|
38
|
+
var _a, _b;
|
39
39
|
const highSeverityActionArn = (_a = this.alarmActions) === null || _a === void 0 ? void 0 : _a.highSeverity;
|
40
40
|
if (highSeverityActionArn) {
|
41
41
|
alarm.addAlarmAction({
|
@@ -51,10 +51,10 @@ class Monitoring extends constructs_1.Construct {
|
|
51
51
|
title,
|
52
52
|
width: 24,
|
53
53
|
}));
|
54
|
-
|
54
|
+
this._highSeverityAlarms.push(alarm);
|
55
55
|
}
|
56
56
|
addLowSeverityAlarm(_title, alarm) {
|
57
|
-
var _a, _b
|
57
|
+
var _a, _b;
|
58
58
|
const normalSeverityActionArn = (_a = this.alarmActions) === null || _a === void 0 ? void 0 : _a.normalSeverity;
|
59
59
|
if (normalSeverityActionArn) {
|
60
60
|
alarm.addAlarmAction({
|
@@ -65,7 +65,7 @@ class Monitoring extends constructs_1.Construct {
|
|
65
65
|
if (normalSeverityAction) {
|
66
66
|
alarm.addAlarmAction(normalSeverityAction);
|
67
67
|
}
|
68
|
-
|
68
|
+
this._lowSeverityAlarms.push(alarm);
|
69
69
|
}
|
70
70
|
get highSeverityAlarms() {
|
71
71
|
return [...this._highSeverityAlarms];
|
@@ -91,4 +91,4 @@ class Monitoring extends constructs_1.Construct {
|
|
91
91
|
}
|
92
92
|
}
|
93
93
|
exports.Monitoring = Monitoring;
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
94
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/monitoring/index.ts"],"names":[],"mappings":"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","sourcesContent":["import * as cw from 'aws-cdk-lib/aws-cloudwatch';\nimport { Watchful } from 'cdk-watchful';\nimport { Construct } from 'constructs';\nimport { AlarmActions } from '../api';\nimport { IMonitoring } from './api';\nimport { WebCanary } from './web-canary';\n\n/**\n * Props for the monitoring construct.\n */\nexport interface MonitoringProps {\n  /**\n   * ARNs of alarm actions to take for various severities.\n   */\n  readonly alarmActions?: AlarmActions;\n}\n\n/**\n * Construct hub monitoring.\n *\n * This construct uses cdk-watchful to automatically generate a dashboard and a\n * set of standard alarms for common resources.\n *\n * Components should use the APIs of this module to add watchful monitors,\n * and add canaries and alarms as needed.\n */\nexport class Monitoring extends Construct implements IMonitoring {\n  private alarmActions?: AlarmActions;\n  private _highSeverityAlarms: cw.AlarmBase[];\n  private _lowSeverityAlarms: cw.AlarmBase[];\n\n  /**\n   * Allows adding automatic monitoring to standard resources. Note that\n   * watchful alarms are always treated as _normal_ severity. You can add\n   * high-severity alarm via `addHighSeverityAlarm()`.\n   */\n  public readonly watchful: Watchful;\n\n  private readonly highSeverityDashboard: cw.Dashboard;\n\n  constructor(scope: Construct, id: string, props: MonitoringProps = {}) {\n    super(scope, id);\n\n    this.alarmActions = props.alarmActions;\n\n    this.watchful = new Watchful(this, 'Watchful', {\n      // alarms that come from watchful are all considered normal severity\n      alarmActionArns: this.alarmActions?.normalSeverity\n        ? [this.alarmActions.normalSeverity]\n        : [],\n      alarmActions: this.alarmActions?.normalSeverityAction\n        ? [this.alarmActions.normalSeverityAction]\n        : [],\n    });\n\n    this._highSeverityAlarms = [];\n    this._lowSeverityAlarms = [];\n\n    this.highSeverityDashboard = new cw.Dashboard(\n      this,\n      'HighSeverityDashboard'\n    );\n  }\n\n  /**\n   * Adds a high-severity alarm. If this alarm goes off, the action specified in `highSeverityAlarmActionArn`\n   * @param alarm\n   */\n  public addHighSeverityAlarm(title: string, alarm: cw.AlarmBase) {\n    const highSeverityActionArn = this.alarmActions?.highSeverity;\n    if (highSeverityActionArn) {\n      alarm.addAlarmAction({\n        bind: () => ({ alarmActionArn: highSeverityActionArn }),\n      });\n    }\n    const highSeverityAction = this.alarmActions?.highSeverityAction;\n    if (highSeverityAction) {\n      alarm.addAlarmAction(highSeverityAction);\n    }\n\n    this.highSeverityDashboard.addWidgets(\n      new cw.AlarmWidget({\n        alarm,\n        title,\n        width: 24,\n      })\n    );\n\n    this._highSeverityAlarms.push(alarm);\n  }\n\n  public addLowSeverityAlarm(_title: string, alarm: cw.AlarmBase) {\n    const normalSeverityActionArn = this.alarmActions?.normalSeverity;\n    if (normalSeverityActionArn) {\n      alarm.addAlarmAction({\n        bind: () => ({ alarmActionArn: normalSeverityActionArn }),\n      });\n    }\n    const normalSeverityAction = this.alarmActions?.normalSeverityAction;\n    if (normalSeverityAction) {\n      alarm.addAlarmAction(normalSeverityAction);\n    }\n    this._lowSeverityAlarms.push(alarm);\n  }\n\n  public get highSeverityAlarms() {\n    return [...this._highSeverityAlarms];\n  }\n\n  public get lowSeverityAlarms() {\n    return [...this._lowSeverityAlarms];\n  }\n\n  /**\n   * Adds a canary that pings a certain URL and raises an alarm in case the URL\n   * responds with an error over 80% of the times.\n   *\n   * Canary failures are always considered high-severity (at this point).\n   *\n   * @param name The name of the canary\n   * @param url The URL to ping\n   */\n  public addWebCanary(name: string, url: string) {\n    const canary = new WebCanary(\n      this,\n      `WebCanary${name.replace(/[^A-Z0-9]/gi, '')}`,\n      {\n        url,\n        displayName: name,\n      }\n    );\n\n    this.addHighSeverityAlarm(`${name} Canary`, canary.alarm);\n  }\n}\n"]}
|
@@ -281,5 +281,5 @@ class CodeArtifact {
|
|
281
281
|
}
|
282
282
|
exports.CodeArtifact = CodeArtifact;
|
283
283
|
_a = JSII_RTTI_SYMBOL_1;
|
284
|
-
CodeArtifact[_a] = { fqn: "construct-hub.sources.CodeArtifact", version: "0.4.
|
284
|
+
CodeArtifact[_a] = { fqn: "construct-hub.sources.CodeArtifact", version: "0.4.6" };
|
285
285
|
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"code-artifact.js","sourceRoot":"","sources":["../../src/package-sources/code-artifact.ts"],"names":[],"mappings":"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","sourcesContent":["import { ArnFormat, Aws, Duration, Stack } from 'aws-cdk-lib';\nimport {\n  ComparisonOperator,\n  GraphWidget,\n  MathExpression,\n  Metric,\n  MetricOptions,\n  Statistic,\n  TreatMissingData,\n} from 'aws-cdk-lib/aws-cloudwatch';\nimport { CfnRepository } from 'aws-cdk-lib/aws-codeartifact';\nimport { Rule } from 'aws-cdk-lib/aws-events';\nimport { LambdaFunction } from 'aws-cdk-lib/aws-events-targets';\nimport { Effect, PolicyStatement } from 'aws-cdk-lib/aws-iam';\nimport { Tracing } from 'aws-cdk-lib/aws-lambda';\nimport { BlockPublicAccess, IBucket } from 'aws-cdk-lib/aws-s3';\nimport { Queue, QueueEncryption } from 'aws-cdk-lib/aws-sqs';\nimport { Construct } from 'constructs';\nimport {\n  codeArtifactRepositoryUrl,\n  lambdaFunctionUrl,\n  lambdaSearchLogGroupUrl,\n  sqsQueueUrl,\n} from '../deep-link';\nimport { fillMetric } from '../metric-utils';\nimport type {\n  IPackageSource,\n  PackageSourceBindOptions,\n  PackageSourceBindResult,\n} from '../package-source';\nimport { S3StorageFactory } from '../s3/storage';\nimport { CodeArtifactForwarder } from './codeartifact/code-artifact-forwarder';\nimport {\n  METRICS_NAMESPACE,\n  MetricName,\n  DOMAIN_NAME_DIMENSION,\n  DOMAIN_OWNER_DIMENSION,\n  REPOSITORY_NAME_DIMENSION,\n} from './codeartifact/constants.lambda-shared';\n\nexport interface CodeArtifactProps {\n  /**\n   * The CodeArtifact repository where packages are obtained from.\n   */\n  readonly repository: CfnRepository;\n\n  /**\n   * The S3 bucket where packages will be staged.\n   */\n  readonly bucket?: IBucket;\n}\n\n/**\n * A package source that obtains package data from an npm CodeArtifact\n * repository.\n */\nexport class CodeArtifact implements IPackageSource {\n  public constructor(private readonly props: CodeArtifactProps) {}\n\n  public bind(\n    scope: Construct,\n    {\n      denyList,\n      ingestion,\n      licenseList,\n      monitoring,\n      overviewDashboard,\n      queue,\n    }: PackageSourceBindOptions\n  ): PackageSourceBindResult {\n    const idPrefix = this.props.repository.node.path;\n    const repositoryId = `${this.props.repository.attrDomainOwner}:${this.props.repository.attrDomainName}/${this.props.repository.attrName}`;\n\n    const storageFactory = S3StorageFactory.getOrCreate(scope);\n    const bucket =\n      this.props.bucket ||\n      storageFactory.newBucket(scope, `${idPrefix}/StagingBucket`, {\n        blockPublicAccess: BlockPublicAccess.BLOCK_ALL,\n        enforceSSL: true,\n        lifecycleRules: [{ expiration: Duration.days(30) }],\n      });\n    bucket.grantRead(ingestion);\n\n    const dlq = new Queue(scope, `${idPrefix}/DLQ`, {\n      encryption: QueueEncryption.KMS_MANAGED,\n      retentionPeriod: Duration.days(14),\n      visibilityTimeout: Duration.minutes(15),\n    });\n\n    const forwarder = new CodeArtifactForwarder(\n      scope,\n      `${idPrefix}/Forwarder`,\n      {\n        deadLetterQueue: dlq,\n        description: `[${scope.node.path}/CodeArtifact/${repositoryId}] Handle CodeArtifact EventBridge events`,\n        environment: {\n          AWS_EMF_ENVIRONMENT: 'Local',\n          BUCKET_NAME: bucket.bucketName,\n          QUEUE_URL: queue.queueUrl,\n        },\n        memorySize: 1024,\n        timeout: Duration.seconds(60),\n        tracing: Tracing.ACTIVE,\n      }\n    );\n    bucket.grantReadWrite(forwarder);\n    denyList?.grantRead(forwarder);\n    licenseList.grantRead(forwarder);\n    queue.grantSendMessages(forwarder);\n    forwarder.addToRolePolicy(\n      new PolicyStatement({\n        effect: Effect.ALLOW,\n        actions: ['codeartifact:GetPackageVersionAsset'],\n        resources: [\n          Stack.of(scope).formatArn({\n            service: 'codeartifact',\n            resource: 'package',\n            arnFormat: ArnFormat.SLASH_RESOURCE_NAME,\n            resourceName: [\n              this.props.repository.attrDomainName,\n              this.props.repository.attrName,\n              'npm', // package format\n              '*', // namespace/package-name\n            ].join('/'),\n          }),\n        ],\n      })\n    );\n\n    const rule = new Rule(scope, `${idPrefix}/EventBridge`, {\n      description: `${scope.node.path}/CodeArtifact/${repositoryId}/EventBridge`,\n      eventPattern: {\n        source: ['aws.codeartifact'],\n        detailType: ['CodeArtifact Package Version State Change'],\n        detail: {\n          domainOwner: [this.props.repository.attrDomainOwner],\n          domainName: [this.props.repository.attrDomainName],\n          repositoryName: [this.props.repository.attrName],\n          packageFormat: ['npm'],\n        },\n      },\n      targets: [new LambdaFunction(forwarder)],\n    });\n\n    const failureAlarm = forwarder\n      .metricErrors()\n      .createAlarm(scope, `${idPrefix}/Forwarder/Failures`, {\n        alarmName: `${scope.node.path}/CodeArtifact/${repositoryId}/Forwarder`,\n        alarmDescription: [\n          `The CodeArtifact fowarder for ${repositoryId} is failing`,\n          '',\n          `Link to the lambda function: ${lambdaFunctionUrl(forwarder)}`,\n        ].join('\\n'),\n        comparisonOperator:\n          ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n        evaluationPeriods: 3,\n        threshold: 1,\n        treatMissingData: TreatMissingData.MISSING,\n      });\n    monitoring.addHighSeverityAlarm(\n      `CodeArtifact:${this.props.repository.attrName} Failures`,\n      failureAlarm\n    );\n\n    const dlqNotEmptyAlarm = new MathExpression({\n      expression: 'mVisible + mHidden',\n      usingMetrics: {\n        mVisible: dlq.metricApproximateNumberOfMessagesVisible({\n          period: Duration.minutes(1),\n        }),\n        mHidden: dlq.metricApproximateNumberOfMessagesNotVisible({\n          period: Duration.minutes(1),\n        }),\n      },\n    }).createAlarm(scope, `${idPrefix}/Forwarder/DLQNotEmpty`, {\n      alarmName: `${scope.node.path}/CodeArtifact/${repositoryId}/DLQNotEmpty`,\n      alarmDescription: [\n        `The CodeArtifact fowarder for ${repositoryId} is failing`,\n        '',\n        `Link to the lambda function: ${lambdaFunctionUrl(forwarder)}`,\n        `Link to the dead letter queue: ${sqsQueueUrl(dlq)}`,\n      ].join('/n'),\n      comparisonOperator: ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD,\n      evaluationPeriods: 1,\n      threshold: 1,\n      treatMissingData: TreatMissingData.NOT_BREACHING,\n    });\n    monitoring.addLowSeverityAlarm(\n      `CodeArtifact/${repositoryId} DLQ Not Empty`,\n      dlqNotEmptyAlarm\n    );\n\n    rule.node.addDependency(failureAlarm, dlqNotEmptyAlarm);\n\n    overviewDashboard.addDLQMetricToDashboard(\n      `CodeArtifact/${repositoryId} DLQ`,\n      dlq\n    );\n    overviewDashboard.addConcurrentExecutionMetricToDashboard(\n      forwarder,\n      `${idPrefix}/ForwarderLambda`\n    );\n\n    return {\n      name: `CodeArtifact: ${repositoryId}`,\n      links: [\n        {\n          name: 'CodeArtifact',\n          url: codeArtifactRepositoryUrl(this.props.repository),\n          primary: true,\n        },\n        {\n          name: 'Forwarder Function',\n          url: lambdaFunctionUrl(forwarder),\n        },\n        {\n          name: 'Search Log group',\n          url: lambdaSearchLogGroupUrl(forwarder),\n        },\n        {\n          name: 'DLQ',\n          url: sqsQueueUrl(dlq),\n        },\n      ],\n      dashboardWidgets: [\n        [\n          new GraphWidget({\n            height: 6,\n            width: 12,\n            title: 'Function Health',\n            left: [\n              fillMetric(forwarder.metricInvocations({ label: 'Invocations' })),\n              fillMetric(forwarder.metricErrors({ label: 'Errors' })),\n            ],\n            leftYAxis: { min: 0 },\n            right: [forwarder.metricDuration({ label: 'Duration' })],\n            rightYAxis: { min: 0 },\n            period: Duration.minutes(15),\n          }),\n          new GraphWidget({\n            height: 6,\n            width: 12,\n            title: 'Dead Letter Queue',\n            left: [\n              dlq.metricApproximateNumberOfMessagesVisible({\n                label: 'Visible Messages',\n                period: Duration.minutes(1),\n              }),\n              dlq.metricApproximateNumberOfMessagesNotVisible({\n                label: 'Hidden Messages',\n                period: Duration.minutes(1),\n              }),\n            ],\n            leftYAxis: { min: 0 },\n            right: [\n              dlq.metricApproximateAgeOfOldestMessage({\n                label: 'Oldest Message Age',\n                period: Duration.minutes(1),\n              }),\n            ],\n            rightYAxis: { min: 0 },\n          }),\n        ],\n        [\n          new GraphWidget({\n            height: 6,\n            width: 12,\n            title: 'Quality Metrics',\n            left: [\n              fillMetric(\n                this.metricNotJsiiEnabledCount({ label: 'Not a jsii package' }),\n                0\n              ),\n              fillMetric(\n                this.metricIneligibleLicense({ label: 'Ineligible License' }),\n                0\n              ),\n              fillMetric(\n                this.metricDenyListedCount({ label: 'Deny Listed' }),\n                0\n              ),\n              fillMetric(\n                this.metricDeletedCount({ label: 'Deletion Events' }),\n                0\n              ),\n            ],\n            leftYAxis: { min: 0 },\n          }),\n        ],\n      ],\n    };\n  }\n\n  /**\n   * The count of package versions that were ignored due to being in the deny list.\n   */\n  public metricDenyListedCount(opts?: MetricOptions): Metric {\n    return new Metric({\n      period: Duration.minutes(5),\n      statistic: Statistic.SUM,\n      ...opts,\n      dimensionsMap: {\n        [DOMAIN_OWNER_DIMENSION]: this.props.repository.attrDomainOwner,\n        [DOMAIN_NAME_DIMENSION]: this.props.repository.attrDomainName,\n        [REPOSITORY_NAME_DIMENSION]: this.props.repository.attrName,\n      },\n      metricName: MetricName.DENY_LISTED_COUNT,\n      namespace: METRICS_NAMESPACE,\n    });\n  }\n\n  /**\n   * The number of package versions that were ignored due to using an ineloigible license.\n   */\n  public metricIneligibleLicense(opts?: MetricOptions): Metric {\n    return new Metric({\n      period: Duration.minutes(5),\n      statistic: Statistic.SUM,\n      ...opts,\n      dimensionsMap: {\n        [DOMAIN_OWNER_DIMENSION]:\n          this.props.repository.attrDomainOwner ?? Aws.ACCOUNT_ID,\n        [DOMAIN_NAME_DIMENSION]: this.props.repository.attrDomainName,\n        [REPOSITORY_NAME_DIMENSION]: this.props.repository.attrName,\n      },\n      metricName: MetricName.INELIGIBLE_LICENSE,\n      namespace: METRICS_NAMESPACE,\n    });\n  }\n\n  /**\n   * The number of package versions that were deleted from CodeArtifact (those events are not\n   * handled currently).\n   */\n  public metricDeletedCount(opts?: MetricOptions): Metric {\n    return new Metric({\n      period: Duration.minutes(5),\n      statistic: Statistic.SUM,\n      ...opts,\n      dimensionsMap: {\n        [DOMAIN_OWNER_DIMENSION]:\n          this.props.repository.attrDomainOwner ?? Aws.ACCOUNT_ID,\n        [DOMAIN_NAME_DIMENSION]: this.props.repository.attrDomainName,\n        [REPOSITORY_NAME_DIMENSION]: this.props.repository.attrName,\n      },\n      metricName: MetricName.DELETED_COUNT,\n      namespace: METRICS_NAMESPACE,\n    });\n  }\n\n  /**\n   * The number of package versions that do not have a jsii assembly in the package.\n   */\n  public metricNotJsiiEnabledCount(opts?: MetricOptions): Metric {\n    return new Metric({\n      period: Duration.minutes(5),\n      statistic: Statistic.SUM,\n      ...opts,\n      dimensionsMap: {\n        [DOMAIN_OWNER_DIMENSION]:\n          this.props.repository.attrDomainOwner ?? Aws.ACCOUNT_ID,\n        [DOMAIN_NAME_DIMENSION]: this.props.repository.attrDomainName,\n        [REPOSITORY_NAME_DIMENSION]: this.props.repository.attrName,\n      },\n      metricName: MetricName.NOT_JSII_ENABLED_COUNT,\n      namespace: METRICS_NAMESPACE,\n    });\n  }\n}\n"]}
|
@@ -23,7 +23,14 @@ export declare const enum MetricName {
|
|
23
23
|
* The number of package versions that were tracked at the beginning of the
|
24
24
|
* package canary execution that produced the data point.
|
25
25
|
*/
|
26
|
-
TRACKED_VERSION_COUNT = "TrackedVersionCount"
|
26
|
+
TRACKED_VERSION_COUNT = "TrackedVersionCount",
|
27
|
+
/**
|
28
|
+
* The estimated lag between the npm registry replica (replicate.npmjs.com)
|
29
|
+
* and the primary registry (registry.npmjs.com). This cannot be measured
|
30
|
+
* directly because the primary does not expose the relevant CouchDB endpoints,
|
31
|
+
* so we use the probe package to get a low-resolution view of this.
|
32
|
+
*/
|
33
|
+
NPM_REPLICA_LAG = "EstimatedNpmReplicaLag"
|
27
34
|
}
|
28
35
|
export declare const enum ObjectKey {
|
29
36
|
STATE_PREFIX = "package-canary/",
|
@@ -2,4 +2,4 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.METRICS_NAMESPACE = void 0;
|
4
4
|
exports.METRICS_NAMESPACE = 'ConstructHub/PackageCanary';
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3BhY2thZ2Utc291cmNlcy9ucG1qcy9jYW5hcnkvY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1hLFFBQUEsaUJBQWlCLEdBQUcsNEJBQTRCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY29uc3QgZW51bSBFbnZpcm9ubWVudCB7XG4gIFBBQ0tBR0VfTkFNRSA9ICdQQUNLQUdFX05BTUUnLFxuICBQQUNLQUdFX0NBTkFSWV9CVUNLRVRfTkFNRSA9ICdQQUNLQUdFX0NBTkFSWV9CVUNLRVRfTkFNRScsXG4gIENPTlNUUlVDVF9IVUJfQkFTRV9VUkwgPSAnQ09OU1RSVUNUX0hVQl9CQVNFX1VSTCcsXG59XG5cbmV4cG9ydCBjb25zdCBNRVRSSUNTX05BTUVTUEFDRSA9ICdDb25zdHJ1Y3RIdWIvUGFja2FnZUNhbmFyeSc7XG5cbmV4cG9ydCBjb25zdCBlbnVtIE1ldHJpY05hbWUge1xuICAvKipcbiAgICogVGhlIHRpbWUgZWxhcHNlZCBzaW5jZSBhIHBhY2thZ2Ugd2FzIHB1Ymxpc2hlZCB0byBucG1qcy5jb20sIHdoaWxlIGl0IGhhc1xuICAgKiBub3QgYmVlbiBkZXRlY3RlZCBpbiB0aGUgY2F0YWxvZyBieSB0aGUgcGFja2FnZSBjYW5hcnkuXG4gICAqXG4gICAqIFRoaXMgbWV0cmljcyBpcyBvbmx5IGVtaXR0ZWQgdW50aWwgdGhlIHBhY2thZ2UgaGFzIGJlZW4gZGV0ZWN0ZWQuXG4gICAqL1xuICBEV0VMTF9USU1FID0gJ0R3ZWxsVGltZScsXG5cbiAgLyoqXG4gICAqIFRoZSB0aW1lIGl0IHRvb2sgYmV0d2VlbiBhIHBhY2thZ2UncyBwdWJsaWNhdGlvbiB0byBucG1qcy5jb20gYW5kIHdoZW4gdGhlXG4gICAqIHBhY2thZ2UgY2FuYXJ5IGRldGVjdGVkIHRoZSBwYWNrYWdlIGFzIGF2YWlsYWJsZSBpbiB0aGUgY2F0YWxvZy5cbiAgICpcbiAgICogVGhpcyBtZXRyaWMgaXMgbm90IGVtaXR0ZWQgdW50aWwgdGhlIHBhY2thZ2UgaGFzIGFjdHVhbGx5IGJlZW4gZGV0ZWN0ZWQuXG4gICAqL1xuICBUSU1FX1RPX0NBVEFMT0cgPSAnVGltZVRvQ2F0YWxvZycsXG5cbiAgLyoqXG4gICAqIFRoZSBudW1iZXIgb2YgcGFja2FnZSB2ZXJzaW9ucyB0aGF0IHdlcmUgdHJhY2tlZCBhdCB0aGUgYmVnaW5uaW5nIG9mIHRoZVxuICAgKiBwYWNrYWdlIGNhbmFyeSBleGVjdXRpb24gdGhhdCBwcm9kdWNlZCB0aGUgZGF0YSBwb2ludC5cbiAgICovXG4gIFRSQUNLRURfVkVSU0lPTl9DT1VOVCA9ICdUcmFja2VkVmVyc2lvbkNvdW50JyxcblxuICAvKipcbiAgICogVGhlIGVzdGltYXRlZCBsYWcgYmV0d2VlbiB0aGUgbnBtIHJlZ2lzdHJ5IHJlcGxpY2EgKHJlcGxpY2F0ZS5ucG1qcy5jb20pXG4gICAqIGFuZCB0aGUgcHJpbWFyeSByZWdpc3RyeSAocmVnaXN0cnkubnBtanMuY29tKS4gVGhpcyBjYW5ub3QgYmUgbWVhc3VyZWRcbiAgICogZGlyZWN0bHkgYmVjYXVzZSB0aGUgcHJpbWFyeSBkb2VzIG5vdCBleHBvc2UgdGhlIHJlbGV2YW50IENvdWNoREIgZW5kcG9pbnRzLFxuICAgKiBzbyB3ZSB1c2UgdGhlIHByb2JlIHBhY2thZ2UgdG8gZ2V0IGEgbG93LXJlc29sdXRpb24gdmlldyBvZiB0aGlzLlxuICAgKi9cbiAgTlBNX1JFUExJQ0FfTEFHID0gJ0VzdGltYXRlZE5wbVJlcGxpY2FMYWcnLFxufVxuXG5leHBvcnQgY29uc3QgZW51bSBPYmplY3RLZXkge1xuICBTVEFURV9QUkVGSVggPSAncGFja2FnZS1jYW5hcnkvJyxcbiAgU1RBVEVfU1VGRklYID0gJy5zdGF0ZS5qc29uJyxcbn1cbiJdfQ==
|
@@ -7,8 +7,24 @@ export interface NpmJsPackageCanaryProps {
|
|
7
7
|
readonly packageName: string;
|
8
8
|
}
|
9
9
|
export declare class NpmJsPackageCanary extends Construct {
|
10
|
+
private readonly handler;
|
10
11
|
constructor(scope: Construct, id: string, props: NpmJsPackageCanaryProps);
|
11
12
|
metricDwellTime(opts?: MetricOptions): Metric;
|
12
13
|
metricTimeToCatalog(opts?: MetricOptions): Metric;
|
13
14
|
metricTrackedVersionCount(opts?: MetricOptions): Metric;
|
15
|
+
/**
|
16
|
+
* The estimated lag between the npm registry replica (replcate.npmjs.com) and
|
17
|
+
* the primary registry (registry.npmjs.com).
|
18
|
+
*
|
19
|
+
* IMPORTANT NOTE: This is based on the difference in modified timestamps for
|
20
|
+
* the probe package between the two and hence has a granularly no better than
|
21
|
+
* the publishing interval of this. Since the construct-hub-probe package is
|
22
|
+
* only published every 3 hours approximately, this metric has a resolution
|
23
|
+
* that is strictly worse than 3 hours.
|
24
|
+
*/
|
25
|
+
metricEstimatedNpmReplicaLag(opts?: MetricOptions): Metric;
|
26
|
+
metricErrors(opts?: MetricOptions): Metric;
|
27
|
+
metricInvocations(opts?: MetricOptions): Metric;
|
28
|
+
metricThrottles(opts?: MetricOptions): Metric;
|
29
|
+
metricDuration(opts?: MetricOptions): Metric;
|
14
30
|
}
|
@@ -12,7 +12,7 @@ const npmjs_package_canary_1 = require("./npmjs-package-canary");
|
|
12
12
|
class NpmJsPackageCanary extends constructs_1.Construct {
|
13
13
|
constructor(scope, id, props) {
|
14
14
|
super(scope, id);
|
15
|
-
|
15
|
+
this.handler = new npmjs_package_canary_1.NpmjsPackageCanary(this, 'Resource', {
|
16
16
|
architecture: _lambda_architecture_1.gravitonLambdaIfAvailable(this),
|
17
17
|
description: `[${scope.node.path}/PackageCanary] Monitors ${props.packageName} versions availability`,
|
18
18
|
environment: {
|
@@ -24,11 +24,11 @@ class NpmJsPackageCanary extends constructs_1.Construct {
|
|
24
24
|
memorySize: 10024,
|
25
25
|
timeout: aws_cdk_lib_1.Duration.minutes(1),
|
26
26
|
});
|
27
|
-
const grant = props.bucket.grantReadWrite(handler, `${"package-canary/" /* STATE_PREFIX */}*${".state.json" /* STATE_SUFFIX */}`);
|
27
|
+
const grant = props.bucket.grantReadWrite(this.handler, `${"package-canary/" /* STATE_PREFIX */}*${".state.json" /* STATE_SUFFIX */}`);
|
28
28
|
const schedule = new aws_events_1.Rule(this, 'Schedule', {
|
29
29
|
description: 'Scheduled executions of the NpmJS package canary',
|
30
30
|
schedule: aws_events_1.Schedule.rate(aws_cdk_lib_1.Duration.minutes(1)),
|
31
|
-
targets: [new aws_events_targets_1.LambdaFunction(handler)],
|
31
|
+
targets: [new aws_events_targets_1.LambdaFunction(this.handler)],
|
32
32
|
});
|
33
33
|
// Ensure we don't attempt to run before permissions have been granted.
|
34
34
|
schedule.node.addDependency(grant);
|
@@ -60,6 +60,37 @@ class NpmJsPackageCanary extends constructs_1.Construct {
|
|
60
60
|
namespace: constants_1.METRICS_NAMESPACE,
|
61
61
|
});
|
62
62
|
}
|
63
|
+
/**
|
64
|
+
* The estimated lag between the npm registry replica (replcate.npmjs.com) and
|
65
|
+
* the primary registry (registry.npmjs.com).
|
66
|
+
*
|
67
|
+
* IMPORTANT NOTE: This is based on the difference in modified timestamps for
|
68
|
+
* the probe package between the two and hence has a granularly no better than
|
69
|
+
* the publishing interval of this. Since the construct-hub-probe package is
|
70
|
+
* only published every 3 hours approximately, this metric has a resolution
|
71
|
+
* that is strictly worse than 3 hours.
|
72
|
+
*/
|
73
|
+
metricEstimatedNpmReplicaLag(opts) {
|
74
|
+
return new aws_cloudwatch_1.Metric({
|
75
|
+
period: aws_cdk_lib_1.Duration.minutes(1),
|
76
|
+
statistic: aws_cloudwatch_1.Statistic.MAXIMUM,
|
77
|
+
...opts,
|
78
|
+
metricName: "EstimatedNpmReplicaLag" /* NPM_REPLICA_LAG */,
|
79
|
+
namespace: constants_1.METRICS_NAMESPACE,
|
80
|
+
});
|
81
|
+
}
|
82
|
+
metricErrors(opts) {
|
83
|
+
return this.handler.metricErrors(opts);
|
84
|
+
}
|
85
|
+
metricInvocations(opts) {
|
86
|
+
return this.handler.metricInvocations(opts);
|
87
|
+
}
|
88
|
+
metricThrottles(opts) {
|
89
|
+
return this.handler.metricThrottles(opts);
|
90
|
+
}
|
91
|
+
metricDuration(opts) {
|
92
|
+
return this.handler.metricDuration(opts);
|
93
|
+
}
|
63
94
|
}
|
64
95
|
exports.NpmJsPackageCanary = NpmJsPackageCanary;
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
96
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/package-sources/npmjs/canary/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration } from 'aws-cdk-lib';\nimport { MetricOptions, Metric, Statistic } from 'aws-cdk-lib/aws-cloudwatch';\nimport { Rule, Schedule } from 'aws-cdk-lib/aws-events';\nimport { LambdaFunction } from 'aws-cdk-lib/aws-events-targets';\nimport { IBucket } from 'aws-cdk-lib/aws-s3';\nimport { Construct } from 'constructs';\nimport { gravitonLambdaIfAvailable } from '../../../backend/_lambda-architecture';\nimport {\n  Environment,\n  ObjectKey,\n  METRICS_NAMESPACE,\n  MetricName,\n} from './constants';\nimport { NpmjsPackageCanary as Handler } from './npmjs-package-canary';\n\nexport interface NpmJsPackageCanaryProps {\n  readonly bucket: IBucket;\n  readonly constructHubBaseUrl: string;\n  readonly packageName: string;\n}\n\nexport class NpmJsPackageCanary extends Construct {\n  private readonly handler: Handler;\n\n  public constructor(\n    scope: Construct,\n    id: string,\n    props: NpmJsPackageCanaryProps\n  ) {\n    super(scope, id);\n\n    this.handler = new Handler(this, 'Resource', {\n      architecture: gravitonLambdaIfAvailable(this),\n      description: `[${scope.node.path}/PackageCanary] Monitors ${props.packageName} versions availability`,\n      environment: {\n        AWS_EMF_ENVIRONMENT: 'Local',\n        [Environment.CONSTRUCT_HUB_BASE_URL]: props.constructHubBaseUrl,\n        [Environment.PACKAGE_CANARY_BUCKET_NAME]: props.bucket.bucketName,\n        [Environment.PACKAGE_NAME]: props.packageName,\n      },\n      memorySize: 10_024,\n      timeout: Duration.minutes(1),\n    });\n    const grant = props.bucket.grantReadWrite(\n      this.handler,\n      `${ObjectKey.STATE_PREFIX}*${ObjectKey.STATE_SUFFIX}`\n    );\n\n    const schedule = new Rule(this, 'Schedule', {\n      description: 'Scheduled executions of the NpmJS package canary',\n      schedule: Schedule.rate(Duration.minutes(1)),\n      targets: [new LambdaFunction(this.handler)],\n    });\n    // Ensure we don't attempt to run before permissions have been granted.\n    schedule.node.addDependency(grant);\n  }\n\n  public metricDwellTime(opts?: MetricOptions): Metric {\n    return new Metric({\n      period: Duration.minutes(1),\n      statistic: Statistic.MAXIMUM,\n      ...opts,\n      metricName: MetricName.DWELL_TIME,\n      namespace: METRICS_NAMESPACE,\n    });\n  }\n\n  public metricTimeToCatalog(opts?: MetricOptions): Metric {\n    return new Metric({\n      period: Duration.minutes(1),\n      statistic: Statistic.MAXIMUM,\n      ...opts,\n      metricName: MetricName.TIME_TO_CATALOG,\n      namespace: METRICS_NAMESPACE,\n    });\n  }\n\n  public metricTrackedVersionCount(opts?: MetricOptions): Metric {\n    return new Metric({\n      period: Duration.minutes(1),\n      statistic: Statistic.MAXIMUM,\n      ...opts,\n      metricName: MetricName.TRACKED_VERSION_COUNT,\n      namespace: METRICS_NAMESPACE,\n    });\n  }\n\n  /**\n   * The estimated lag between the npm registry replica (replcate.npmjs.com) and\n   * the primary registry (registry.npmjs.com).\n   *\n   * IMPORTANT NOTE: This is based on the difference in modified timestamps for\n   * the probe package between the two and hence has a granularly no better than\n   * the publishing interval of this. Since the construct-hub-probe package is\n   * only published every 3 hours approximately, this metric has a resolution\n   * that is strictly worse than 3 hours.\n   */\n  public metricEstimatedNpmReplicaLag(opts?: MetricOptions): Metric {\n    return new Metric({\n      period: Duration.minutes(1),\n      statistic: Statistic.MAXIMUM,\n      ...opts,\n      metricName: MetricName.NPM_REPLICA_LAG,\n      namespace: METRICS_NAMESPACE,\n    });\n  }\n\n  public metricErrors(opts?: MetricOptions): Metric {\n    return this.handler.metricErrors(opts);\n  }\n\n  public metricInvocations(opts?: MetricOptions): Metric {\n    return this.handler.metricInvocations(opts);\n  }\n\n  public metricThrottles(opts?: MetricOptions): Metric {\n    return this.handler.metricThrottles(opts);\n  }\n\n  public metricDuration(opts?: MetricOptions): Metric {\n    return this.handler.metricDuration(opts);\n  }\n}\n"]}
|
@@ -8075,6 +8075,7 @@ var require_lib2 = __commonJS({
|
|
8075
8075
|
// src/package-sources/npmjs/canary/npmjs-package-canary.lambda.ts
|
8076
8076
|
var npmjs_package_canary_lambda_exports = {};
|
8077
8077
|
__export(npmjs_package_canary_lambda_exports, {
|
8078
|
+
CanaryStateService: () => CanaryStateService,
|
8078
8079
|
handler: () => handler
|
8079
8080
|
});
|
8080
8081
|
module.exports = __toCommonJS(npmjs_package_canary_lambda_exports);
|
@@ -8129,9 +8130,10 @@ async function handler(event) {
|
|
8129
8130
|
console.log(`Initial state: ${JSON.stringify(state, null, 2)}`);
|
8130
8131
|
updateLatestIfNeeded(state, latest);
|
8131
8132
|
try {
|
8132
|
-
await (0, import_aws_embedded_metrics.metricScope)((metrics) => () => {
|
8133
|
+
await (0, import_aws_embedded_metrics.metricScope)((metrics) => async () => {
|
8133
8134
|
metrics.setDimensions();
|
8134
8135
|
metrics.putMetric("TrackedVersionCount" /* TRACKED_VERSION_COUNT */, Object.keys(state.pending).length + 1, import_aws_embedded_metrics.Unit.Count);
|
8136
|
+
metrics.putMetric("EstimatedNpmReplicaLag" /* NPM_REPLICA_LAG */, await stateService.npmReplicaLagSeconds(packageName), import_aws_embedded_metrics.Unit.Seconds);
|
8135
8137
|
})();
|
8136
8138
|
for (const versionState of [
|
8137
8139
|
state.latest,
|
@@ -8243,6 +8245,22 @@ var CanaryStateService = class {
|
|
8243
8245
|
console.log(`Package: ${packageName} | Version : ${version} | Published At: ${publishedAt}`);
|
8244
8246
|
return { version, publishedAt: new Date(publishedAt) };
|
8245
8247
|
}
|
8248
|
+
async npmReplicaLagSeconds(packageName) {
|
8249
|
+
const encodedPackageName = encodeURIComponent(packageName);
|
8250
|
+
console.log(`Measuring NPM replica lag using ${packageName}...`);
|
8251
|
+
const [primaryDate, replicaDate] = await Promise.all([
|
8252
|
+
getModifiedTimestamp(`registry.npmjs.org`),
|
8253
|
+
getModifiedTimestamp(`replicate.npmjs.com/registry`)
|
8254
|
+
]);
|
8255
|
+
const deltaMs = primaryDate.getTime() - replicaDate.getTime();
|
8256
|
+
console.log(`Timestamp on primary: ${primaryDate.toISOString()}`);
|
8257
|
+
console.log(`Timestamp on replica: ${replicaDate.toISOString()} (${deltaMs / 36e5} hours behind)`);
|
8258
|
+
return deltaMs / 1e3;
|
8259
|
+
async function getModifiedTimestamp(baseUrl) {
|
8260
|
+
const isoDate = await getJSON(`https://${baseUrl}/${encodedPackageName}`, ["time", "modified"]);
|
8261
|
+
return new Date(isoDate);
|
8262
|
+
}
|
8263
|
+
}
|
8246
8264
|
key(packageName) {
|
8247
8265
|
return `${"package-canary/" /* STATE_PREFIX */}${packageName}${".state.json" /* STATE_SUFFIX */}`;
|
8248
8266
|
}
|
@@ -8287,6 +8305,7 @@ function gunzip(readable) {
|
|
8287
8305
|
}
|
8288
8306
|
// Annotate the CommonJS export names for ESM import in node:
|
8289
8307
|
0 && (module.exports = {
|
8308
|
+
CanaryStateService,
|
8290
8309
|
handler
|
8291
8310
|
});
|
8292
8311
|
//# sourceMappingURL=index.js.map
|