Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: fixed coverage job #825

Merged
merged 10 commits into from
Jul 26, 2023
Merged

ci: fixed coverage job #825

merged 10 commits into from
Jul 26, 2023

Conversation

kirrg001
Copy link
Contributor

@kirrg001 kirrg001 commented Jul 18, 2023

refs 132534

See conversation #825 (comment)

@kirrg001 kirrg001 changed the title Fix/coverage job ci: fix coverage job Jul 18, 2023
@@ -68,7 +68,7 @@ const DB2_TABLE_NAME_3 = process.env.DB2_TABLE_NAME_3 || 'table3';
*/
let tries = 0;
const MAX_TRIES = 10;
const CONNECT_TIMEOUT_IN_MS = 500;
const CONNECT_TIMEOUT_IN_MS = 2000;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI I increased the timeouts. I am always running into a broken db2 test locally caused by longer connection issues to the db2 server.

@kirrg001 kirrg001 marked this pull request as ready for review July 26, 2023 11:28
@kirrg001 kirrg001 requested a review from a team as a code owner July 26, 2023 11:28
@kirrg001 kirrg001 changed the title ci: fix coverage job ci: fixed coverage job Jul 26, 2023
Comment on lines +876 to +880
// Spans:
// 11 queries splitted from the file
// 4 fs operations on top (ours + from db2 internally fs-extra)
// https://github.com/ibmdb/node-ibm_db/blob/fb25937524d74d25917e9aa67fb4737971317986/lib/odbc.js#L916
numberOfSpans: oTelIntegrationIsEnabled ? 15 : 11,
// If the Otel integration is disabled, we expect 11 spans.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: If we no longer test for the exact number of spans, can we delete this comment entirely? I don't think it serves a purpose anymore.

@@ -929,8 +923,7 @@ mochaSuiteFn('tracing/db2', function () {
.then(() =>
testUtils.retry(() =>
verifySpans(agentControls, controls, {
// 11 queries + fs calls
numberOfSpans: oTelIntegrationIsEnabled ? 16 : 11,
// 11 Instana spans + 5 Otel Spans
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment can probably be removed

@kirrg001 kirrg001 merged commit 08b5eb4 into main Jul 26, 2023
1 check passed
@kirrg001 kirrg001 deleted the fix/coverage-job branch July 26, 2023 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants