chore: cds^10 #443
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -135,6 +135,5 @@ dist | |
| # test | ||
| test/msg-box | ||
| test/bookshop/gen | ||
|
|
||
| .claude/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| { | ||
| "[logging]": { | ||
| "requires": { | ||
| "telemetry": { | ||
| "tracing": { | ||
| "sampler": { | ||
| "ignoreIncomingPaths": ["/odata/v4/admin/Genres"] | ||
| } | ||
| }, | ||
| "logging": { | ||
| "exporter": { | ||
| "module": "@opentelemetry/sdk-logs", | ||
| "class": "ConsoleLogRecordExporter" | ||
| }, | ||
| "processor": { | ||
| "module": "./lib/MySimpleLogRecordProcessor.js", | ||
| "class": "MySimpleLogRecordProcessor" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "log": { | ||
| "format": "json", | ||
| "cls_custom_fields": ["foo"] | ||
| } | ||
| }, | ||
| "[metrics]": { | ||
| "requires": { | ||
| "telemetry": { | ||
| "metrics": { | ||
| "config": { | ||
| "exportIntervalMillis": 100 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "[metrics-outbox]": { | ||
| "requires": { | ||
| "queue": true, | ||
| "telemetry": { | ||
| "metrics": { | ||
| "config": { | ||
| "exportIntervalMillis": 100 | ||
| }, | ||
| "_db_pool": false, | ||
| "_queue": true, | ||
| "exporter": { | ||
| "module": "@opentelemetry/sdk-metrics", | ||
| "class": "ConsoleMetricExporter" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "[metrics-outbox-disabled]": { | ||
| "requires": { | ||
| "queue": true, | ||
| "telemetry": { | ||
| "metrics": { | ||
| "config": { | ||
| "exportIntervalMillis": 250 | ||
| }, | ||
| "_db_pool": false, | ||
| "_queue": false, | ||
| "exporter": { | ||
| "module": "@opentelemetry/sdk-metrics", | ||
| "class": "ConsoleMetricExporter" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "[tracing-attributes]": { | ||
| "requires": { | ||
| "telemetry": { | ||
| "tracing": { | ||
| "exporter": { | ||
| "module": "@opentelemetry/sdk-trace-node" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "[persistent-outbox]": { | ||
| "requires": { | ||
| "messaging": { | ||
| "kind": "file-based-messaging", | ||
| "file": "../persistent-outbox" | ||
| } | ||
| } | ||
| }, | ||
| "[without-outbox]": { | ||
| "requires": { | ||
| "messaging": { | ||
| "kind": "file-based-messaging", | ||
| "file": "../without-outbox", | ||
| "outboxed": false | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,12 +44,10 @@ | |
| "_kind": "file-based-messaging", | ||
| "file": "../msg-box" | ||
| }, | ||
| "queue": { | ||
| "legacyLocking": false | ||
| }, | ||
| "_scheduling": true, | ||
| "ExternalServiceOne": { | ||
| "kind": "odata", | ||
| "model": "srv/external/ExternalServiceOne" | ||
|
|
@@ -79,42 +77,6 @@ | |
| } | ||
| } | ||
| }, | ||
| "log": { | ||
| "cls_custom_fields": [ | ||
| "tenant_id" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,10 @@ | ||
| /* eslint-disable no-console */ | ||
|
|
||
| // REVISIT: even with profile "logging", cls_custom_fields from package.json wins | ||
| process.env.cds_log = JSON.stringify({ cls_custom_fields: ['foo'] }) | ||
|
|
||
| const cds = require('@sap/cds') | ||
| const { expect, GET } = cds.test(__dirname + '/bookshop', '--profile', 'logging') | ||
|
|
||
| describe('logging', () => { | ||
| const admin = { auth: { username: 'alice' } } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -78,7 +78,7 @@ describe('queue metrics for multi tenant service', () => { | |
| GET('/odata/v4/proxy/proxyCallToExternalServiceOne', user[T2]) | ||
| ]) | ||
|
|
||
| await wait(150) // Wait for metrics to be collected | ||
|
|
||
| expect(metricValue(T1, 'cold_entries')).to.eq(0) | ||
| expect(metricValue(T1, 'incoming_messages')).to.eq(totalInc[T1]) | ||
|
|
@@ -138,7 +138,7 @@ describe('queue metrics for multi tenant service', () => { | |
| if (timeAfterFirstRetry - timeOfInitialCall < 1000) { | ||
| await wait(1000 - (timeAfterFirstRetry - timeOfInitialCall)) | ||
| } | ||
| await wait(150) // ... for metrics to be collected | ||
|
|
||
| expect(metricValue(T1, 'cold_entries')).to.eq(0) | ||
| expect(metricValue(T1, 'incoming_messages')).to.eq(totalInc[T1]) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -86,7 +86,7 @@ describe('queue metrics for single tenant service', () => { | |
| test('metrics are collected', async () => { | ||
| await GET('/odata/v4/proxy/proxyCallToExternalServiceOne', admin) | ||
|
|
||
| await wait(150) // Wait for metrics to be collected | ||
|
|
||
| expect(metricValue('cold_entries', E1)).to.eq(0) | ||
| expect(metricValue('remaining_entries', E1)).to.eq(0) | ||
|
|
@@ -99,7 +99,7 @@ describe('queue metrics for single tenant service', () => { | |
|
|
||
| await GET('/odata/v4/proxy/proxyCallToExternalServiceTwo', admin) | ||
|
|
||
| await wait(150) // Wait for metrics to be collected | ||
|
|
||
| expect(metricValue('cold_entries', E2)).to.eq(0) | ||
| expect(metricValue('remaining_entries', E2)).to.eq(0) | ||
|
|
@@ -149,8 +149,9 @@ describe('queue metrics for single tenant service', () => { | |
| await GET('/odata/v4/proxy/proxyCallToExternalServiceOne', admin) | ||
| await GET('/odata/v4/proxy/proxyCallToExternalServiceTwo', admin) | ||
|
|
||
| await wait(150) // ... for metrics to be collected | ||
| expect(currentRetryCount[E1]).to.eq(1) | ||
| expect(currentRetryCount[E2]).to.eq(1) | ||
|
|
||
| expect(metricValue('cold_entries', E1)).to.eq(0) | ||
| expect(metricValue('remaining_entries', E1)).to.eq(1) | ||
|
|
@@ -171,8 +172,8 @@ describe('queue metrics for single tenant service', () => { | |
| expect(metricValue('max_storage_time_in_seconds', E2)).to.eq(0) | ||
|
|
||
| // Wait for the first retry to be initiated | ||
| while (currentRetryCount[E1] < 2) await wait(10) | ||
| while (currentRetryCount[E2] < 2) await wait(10) | ||
| await wait(150) // ... for the retry to be processed and metrics to be collected | ||
| expect(currentRetryCount[E1]).to.eq(2) | ||
| expect(currentRetryCount[E2]).to.eq(2) | ||
|
|
@@ -183,7 +184,7 @@ describe('queue metrics for single tenant service', () => { | |
| await wait(1000 - (timeAfterFirstRetry - timeOfInitialCall)) | ||
| } | ||
|
|
||
| await wait(150) // ... for metrics to be collected again | ||
|
|
||
| expect(metricValue('cold_entries', E1)).to.eq(0) | ||
| expect(metricValue('remaining_entries', E1)).to.eq(1) | ||
|
|
@@ -204,8 +205,9 @@ describe('queue metrics for single tenant service', () => { | |
| expect(metricValue('max_storage_time_in_seconds', E2)).to.be.gte(1) | ||
|
|
||
| // Wait for the second retry to be initiated | ||
| while (currentRetryCount[E1] < 3) await wait(10) | ||
| while (currentRetryCount[E2] < 3) await wait(10) | ||
| await wait(150) // ... for the retry to be processed and metrics to be collected | ||
| expect(currentRetryCount[E1]).to.eq(3) | ||
| expect(currentRetryCount[E2]).to.eq(3) | ||
|
|
||
|
|
@@ -258,7 +260,7 @@ describe('queue metrics for single tenant service', () => { | |
| await GET('/odata/v4/proxy/proxyCallToExternalServiceOne', admin) | ||
| await GET('/odata/v4/proxy/proxyCallToExternalServiceTwo', admin) | ||
|
|
||
| await wait(150) // ... for metrics to be collected | ||
|
|
||
| expect(metricValue('cold_entries', E1)).to.eq(1) | ||
| expect(metricValue('remaining_entries', E1)).to.eq(0) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,8 @@ | ||
| // process.env.HOST_METRICS_RETAIN_SYSTEM = 'true' //> with this the test would fail | ||
| process.env.HOST_METRICS_LOG_SYSTEM = 'true' | ||
|
|
||
| const cds = require('@sap/cds') | ||
| const { expect, GET } = cds.test(__dirname + '/bookshop', '--profile', 'metrics') | ||
| const log = cds.test.log() | ||
|
|
||
| const wait = require('node:timers/promises').setTimeout | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,5 @@ | ||
| const cds = require('@sap/cds') | ||
| const { expect, data } = cds.test(__dirname + '/bookshop', '--profile', 'tracing-attributes') | ||
| const http = require('http') | ||
|
|
||
| describe('tracing attributes', () => { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,20 @@ | ||
| const CASE = 'persistent-outbox' | ||
|
|
||
| // REVISIT: even with profile "persistent-outbox", messaging kind and file from package.json wins | ||
| process.env.cds_requires_messaging = JSON.stringify({ | ||
| kind: 'file-based-messaging', | ||
| file: `../${CASE}` | ||
|
Contributor
There was a problem hiding this comment. Bug: The Please provide feedback on the review comment by checking the appropriate box:
|
||
| }) | ||
|
|
||
| // REVISIT: check json exports | ||
| const CHECK = (log, expect) => { | ||
| // 3: outbox -> consumers get new root context | ||
| // REVISIT: for some reason, span "cds.spawn run task" has no parent when running in jest | ||
| expect(log.output.match(/\[telemetry\] - elapsed times:/g).length).to.equal(4) //> actually 3 | ||
| expect(log.output.match(/cds.spawn - schedule task/g).length).to.equal(1) | ||
| } | ||
|
|
||
| // REVISIT: re-enable with switch to vitest | ||
| describe.skip(`tracing messaging - ${CASE}`, () => { | ||
| require('./tracing-messaging')(CASE, CHECK) | ||
| }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: The commented-out step originally forced
@sap/cds@8(now corrected to@sap/cds@9in the comment), but the active matrix only testscds-version: [9]whilecds-version: [10]is also commented out. Thebetter-sqlite3rebuild step on line 40 still fires forcds-version -eq 9, so this is fine for now — but the commented line references a workaround that is no longer needed ifcds@9is already installed via line 37. The comment text says@sap/cds@9but this step was originally meant to downgrade when cds-dk installed a newer version; the comment is now misleading about its purpose.Please provide feedback on the review comment by checking the appropriate box: