Skip to content

Conversation

tabgok
Copy link
Contributor

@tabgok tabgok commented Jun 20, 2023

What does this PR do?

Re-enable couchbase testing

This change re-enables testing for the couchbase integration. In order
to do so, there are a few changes which were made:

  1. Use a new container repository for Couchbase (previously owned by sabrenner, now owned by DataDog).
  2. Update the Couchbase server from 6.0.1 to 6.6.5 (invisible, as the container was updated in another repo).
    • Enables 3.2.x and 2.6.12 tests to succeed
  3. Change tested versions of the Couchbase client from:
    • 2.6.5 -> 2.6.12 (due to compilation errors)
    • 3.0.0 -> 3.0.7 (due to flaky connections)
    • 3.1.0 -> 3.1.2 (due to flaky connections)

Motivation

These changes are being made to re-enable Couchbase testing to (a) protect customers and (b) allow other projects (such as service naming) to make tested changes

Plugin Checklist

Couchbase: re-enabling tests and dropping versions

Additional Notes

This change does not add any new code, it only modified the container and tested versions of Couchbase.

@github-actions
Copy link

github-actions bot commented Jun 20, 2023

Overall package size

Self size: 4.9 MB
Deduped: 58 MB
No deduping: 58.09 MB

Dependency sizes

name version self size total size
@datadog/native-iast-taint-tracking 1.5.0 14.86 MB 14.86 MB
@datadog/native-appsec 3.2.0 13.38 MB 13.39 MB
@datadog/pprof 3.1.0 10.66 MB 11.5 MB
protobufjs 7.2.4 2.74 MB 6.52 MB
@datadog/native-iast-rewriter 2.0.1 2.09 MB 2.1 MB
@opentelemetry/core 1.14.0 872.87 kB 1.47 MB
@datadog/native-metrics 2.0.0 898.77 kB 1.3 MB
@opentelemetry/api 1.4.1 780.32 kB 780.32 kB
msgpack-lite 0.1.26 201.16 kB 281.59 kB
opentracing 0.14.7 194.81 kB 194.81 kB
semver 7.5.3 93.39 kB 123.79 kB
@datadog/sketches-js 2.1.0 109.9 kB 109.9 kB
lodash.sortby 4.7.0 75.76 kB 75.76 kB
lru-cache 7.14.0 74.95 kB 74.95 kB
ipaddr.js 2.0.1 59.52 kB 59.52 kB
int64-buffer 0.1.10 49.18 kB 49.18 kB
ignore 5.2.0 48.87 kB 48.87 kB
import-in-the-middle 1.3.5 34.34 kB 38.81 kB
istanbul-lib-coverage 3.2.0 29.34 kB 29.34 kB
retry 0.10.1 27.44 kB 27.44 kB
lodash.uniq 4.5.0 25.01 kB 25.01 kB
limiter 1.1.5 23.17 kB 23.17 kB
lodash.kebabcase 4.1.1 17.75 kB 17.75 kB
lodash.pick 4.4.0 16.33 kB 16.33 kB
node-abort-controller 3.0.1 14.33 kB 14.33 kB
crypto-randomuuid 1.0.0 11.18 kB 11.18 kB
diagnostics_channel 1.1.0 7.07 kB 7.07 kB
path-to-regexp 0.1.7 6.78 kB 6.78 kB
koalas 1.0.2 6.47 kB 6.47 kB
methods 1.1.2 5.29 kB 5.29 kB
module-details-from-path 1.0.3 4.47 kB 4.47 kB

🤖 This report was automatically generated by heaviest-objects-in-the-universe

@codecov
Copy link

codecov bot commented Jun 20, 2023

Codecov Report

Merging #3265 (a7a8672) into master (257294b) will decrease coverage by 2.38%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #3265      +/-   ##
==========================================
- Coverage   84.28%   81.90%   -2.38%     
==========================================
  Files         214       12     -202     
  Lines        8400      796    -7604     
  Branches       33       33              
==========================================
- Hits         7080      652    -6428     
+ Misses       1320      144    -1176     
Impacted Files Coverage Δ
packages/datadog-instrumentations/src/couchbase.js 91.12% <100.00%> (ø)

... and 206 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@pr-commenter
Copy link

pr-commenter bot commented Jun 20, 2023

Benchmarks

Benchmark execution time: 2023-07-19 16:41:34

Comparing candidate commit a7a8672 in PR branch teague.bick/couchbase with baseline commit 257294b in branch master.

Found 0 performance improvements and 3 performance regressions! Performance is the same for 470 metrics, 19 unstable metrics.

scenario:plugin-graphql-with-depth-and-collapse-on-18

  • 🟥 max_rss_usage [+121.927KB; +149.681KB] or [+14.759%; +18.119%]

scenario:plugin-graphql-with-depth-off-18

  • 🟥 max_rss_usage [+127.983KB; +148.441KB] or [+15.607%; +18.102%]

scenario:plugin-graphql-with-depth-on-max-18

  • 🟥 max_rss_usage [+121.446KB; +160.342KB] or [+14.782%; +19.516%]

@tabgok tabgok force-pushed the teague.bick/couchbase branch 3 times, most recently from 6e32fc0 to 4c8a51f Compare July 5, 2023 21:26
@tabgok tabgok changed the title test Re-enable Couchbase testing Jul 5, 2023
@tabgok tabgok requested a review from jbertran July 6, 2023 15:40
@tabgok tabgok force-pushed the teague.bick/couchbase branch 2 times, most recently from 39b0032 to 6c98550 Compare July 6, 2023 15:41
@tabgok tabgok self-assigned this Jul 7, 2023
@tabgok tabgok marked this pull request as ready for review July 10, 2023 19:11
@tabgok tabgok requested a review from a team as a code owner July 10, 2023 19:11
@tabgok tabgok force-pushed the teague.bick/couchbase branch from 6c98550 to 80ff215 Compare July 10, 2023 19:12
@tabgok tabgok force-pushed the teague.bick/couchbase branch 3 times, most recently from ee0908c to 3383403 Compare July 18, 2023 17:34
Qard
Qard previously approved these changes Jul 18, 2023
tabgok added 3 commits July 19, 2023 12:34
This repo uses a slightly modified version of the Couchbase docker image
for testing. This modified version is required to do some base
configuration of the Couchbase container (such as password setup, memory
settings, and more).

Prior to this change, we used a container image/repo owned by Sam
Brenner (sabrenner).  This change forks the sabrenner repository and
adds the container to DataDog's github container repository.
This change updates several of the versions of Couchbase which we test
against.  In particular:

* 2.6.12 replaces 2.6.5 due to an inability to compile 2.6.5 in the
  latest Node releases
* 3.0.7 replaces 3.0.0 due to test timeout issues causing flakiness
* 3.1.2 replaces 3.1.0 due to test timeout issues causing flakiness

These changes put the couchbase dependency in a state where it can be
re-introduced to the CI tests.
Prior to this change, Couchbase tests were disabled due to constant
failures and flaky tests.

Recent changes have fixed the testing issues by:
* Upgrading Couchbase server from 6.0.1 to 6.6.5
* Updating the versions of Couchbase client we use to test

This change re-enables testing the Couchbase integration now that tests
are working and stable.
@tabgok tabgok force-pushed the teague.bick/couchbase branch from ab59cd8 to a7a8672 Compare July 19, 2023 16:34
@tabgok tabgok requested a review from Qard July 19, 2023 16:54
// semver >=3 <3.2.0

addHook({ name: 'couchbase', file: 'lib/collection.js', versions: ['>=3.0.0 <3.2.0'] }, Collection => {
addHook({ name: 'couchbase', file: 'lib/collection.js', versions: ['^3.0.7', '^3.1.3'] }, Collection => {
Copy link
Contributor

Choose a reason for hiding this comment

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

^3.0.7 is the same as >=3.0.7 <4.0.0 so that would already include the range of ^3.1.3.

@tabgok tabgok merged commit 212c440 into master Jul 20, 2023
szegedi pushed a commit that referenced this pull request Jul 21, 2023
* Couchbase: Update Docker Container repo

This repo uses a slightly modified version of the Couchbase docker image
for testing. This modified version is required to do some base
configuration of the Couchbase container (such as password setup, memory
settings, and more).

Prior to this change, we used a container image/repo owned by Sam
Brenner (sabrenner).  This change forks the sabrenner repository and
adds the container to DataDog's github container repository.

* Couchbase: update tested versions

This change updates several of the versions of Couchbase which we test
against.  In particular:

* 2.6.12 replaces 2.6.5 due to an inability to compile 2.6.5 in the
  latest Node releases
* 3.0.7 replaces 3.0.0 due to test timeout issues causing flakiness
* 3.1.2 replaces 3.1.0 due to test timeout issues causing flakiness

These changes put the couchbase dependency in a state where it can be
re-introduced to the CI tests.

* Couchbase: Re-enable testing

Prior to this change, Couchbase tests were disabled due to constant
failures and flaky tests.

Recent changes have fixed the testing issues by:
* Upgrading Couchbase server from 6.0.1 to 6.6.5
* Updating the versions of Couchbase client we use to test

This change re-enables testing the Couchbase integration now that tests
are working and stable.
szegedi pushed a commit that referenced this pull request Jul 21, 2023
* Couchbase: Update Docker Container repo

This repo uses a slightly modified version of the Couchbase docker image
for testing. This modified version is required to do some base
configuration of the Couchbase container (such as password setup, memory
settings, and more).

Prior to this change, we used a container image/repo owned by Sam
Brenner (sabrenner).  This change forks the sabrenner repository and
adds the container to DataDog's github container repository.

* Couchbase: update tested versions

This change updates several of the versions of Couchbase which we test
against.  In particular:

* 2.6.12 replaces 2.6.5 due to an inability to compile 2.6.5 in the
  latest Node releases
* 3.0.7 replaces 3.0.0 due to test timeout issues causing flakiness
* 3.1.2 replaces 3.1.0 due to test timeout issues causing flakiness

These changes put the couchbase dependency in a state where it can be
re-introduced to the CI tests.

* Couchbase: Re-enable testing

Prior to this change, Couchbase tests were disabled due to constant
failures and flaky tests.

Recent changes have fixed the testing issues by:
* Upgrading Couchbase server from 6.0.1 to 6.6.5
* Updating the versions of Couchbase client we use to test

This change re-enables testing the Couchbase integration now that tests
are working and stable.
szegedi pushed a commit that referenced this pull request Jul 21, 2023
* Couchbase: Update Docker Container repo

This repo uses a slightly modified version of the Couchbase docker image
for testing. This modified version is required to do some base
configuration of the Couchbase container (such as password setup, memory
settings, and more).

Prior to this change, we used a container image/repo owned by Sam
Brenner (sabrenner).  This change forks the sabrenner repository and
adds the container to DataDog's github container repository.

* Couchbase: update tested versions

This change updates several of the versions of Couchbase which we test
against.  In particular:

* 2.6.12 replaces 2.6.5 due to an inability to compile 2.6.5 in the
  latest Node releases
* 3.0.7 replaces 3.0.0 due to test timeout issues causing flakiness
* 3.1.2 replaces 3.1.0 due to test timeout issues causing flakiness

These changes put the couchbase dependency in a state where it can be
re-introduced to the CI tests.

* Couchbase: Re-enable testing

Prior to this change, Couchbase tests were disabled due to constant
failures and flaky tests.

Recent changes have fixed the testing issues by:
* Upgrading Couchbase server from 6.0.1 to 6.6.5
* Updating the versions of Couchbase client we use to test

This change re-enables testing the Couchbase integration now that tests
are working and stable.
This was referenced Jul 21, 2023
szegedi pushed a commit that referenced this pull request Jul 21, 2023
* Couchbase: Update Docker Container repo

This repo uses a slightly modified version of the Couchbase docker image
for testing. This modified version is required to do some base
configuration of the Couchbase container (such as password setup, memory
settings, and more).

Prior to this change, we used a container image/repo owned by Sam
Brenner (sabrenner).  This change forks the sabrenner repository and
adds the container to DataDog's github container repository.

* Couchbase: update tested versions

This change updates several of the versions of Couchbase which we test
against.  In particular:

* 2.6.12 replaces 2.6.5 due to an inability to compile 2.6.5 in the
  latest Node releases
* 3.0.7 replaces 3.0.0 due to test timeout issues causing flakiness
* 3.1.2 replaces 3.1.0 due to test timeout issues causing flakiness

These changes put the couchbase dependency in a state where it can be
re-introduced to the CI tests.

* Couchbase: Re-enable testing

Prior to this change, Couchbase tests were disabled due to constant
failures and flaky tests.

Recent changes have fixed the testing issues by:
* Upgrading Couchbase server from 6.0.1 to 6.6.5
* Updating the versions of Couchbase client we use to test

This change re-enables testing the Couchbase integration now that tests
are working and stable.
szegedi pushed a commit that referenced this pull request Jul 21, 2023
* Couchbase: Update Docker Container repo

This repo uses a slightly modified version of the Couchbase docker image
for testing. This modified version is required to do some base
configuration of the Couchbase container (such as password setup, memory
settings, and more).

Prior to this change, we used a container image/repo owned by Sam
Brenner (sabrenner).  This change forks the sabrenner repository and
adds the container to DataDog's github container repository.

* Couchbase: update tested versions

This change updates several of the versions of Couchbase which we test
against.  In particular:

* 2.6.12 replaces 2.6.5 due to an inability to compile 2.6.5 in the
  latest Node releases
* 3.0.7 replaces 3.0.0 due to test timeout issues causing flakiness
* 3.1.2 replaces 3.1.0 due to test timeout issues causing flakiness

These changes put the couchbase dependency in a state where it can be
re-introduced to the CI tests.

* Couchbase: Re-enable testing

Prior to this change, Couchbase tests were disabled due to constant
failures and flaky tests.

Recent changes have fixed the testing issues by:
* Upgrading Couchbase server from 6.0.1 to 6.6.5
* Updating the versions of Couchbase client we use to test

This change re-enables testing the Couchbase integration now that tests
are working and stable.
szegedi pushed a commit that referenced this pull request Jul 21, 2023
* Couchbase: Update Docker Container repo

This repo uses a slightly modified version of the Couchbase docker image
for testing. This modified version is required to do some base
configuration of the Couchbase container (such as password setup, memory
settings, and more).

Prior to this change, we used a container image/repo owned by Sam
Brenner (sabrenner).  This change forks the sabrenner repository and
adds the container to DataDog's github container repository.

* Couchbase: update tested versions

This change updates several of the versions of Couchbase which we test
against.  In particular:

* 2.6.12 replaces 2.6.5 due to an inability to compile 2.6.5 in the
  latest Node releases
* 3.0.7 replaces 3.0.0 due to test timeout issues causing flakiness
* 3.1.2 replaces 3.1.0 due to test timeout issues causing flakiness

These changes put the couchbase dependency in a state where it can be
re-introduced to the CI tests.

* Couchbase: Re-enable testing

Prior to this change, Couchbase tests were disabled due to constant
failures and flaky tests.

Recent changes have fixed the testing issues by:
* Upgrading Couchbase server from 6.0.1 to 6.6.5
* Updating the versions of Couchbase client we use to test

This change re-enables testing the Couchbase integration now that tests
are working and stable.
tlhunter pushed a commit that referenced this pull request Jul 21, 2023
* Couchbase: Update Docker Container repo

This repo uses a slightly modified version of the Couchbase docker image
for testing. This modified version is required to do some base
configuration of the Couchbase container (such as password setup, memory
settings, and more).

Prior to this change, we used a container image/repo owned by Sam
Brenner (sabrenner).  This change forks the sabrenner repository and
adds the container to DataDog's github container repository.

* Couchbase: update tested versions

This change updates several of the versions of Couchbase which we test
against.  In particular:

* 2.6.12 replaces 2.6.5 due to an inability to compile 2.6.5 in the
  latest Node releases
* 3.0.7 replaces 3.0.0 due to test timeout issues causing flakiness
* 3.1.2 replaces 3.1.0 due to test timeout issues causing flakiness

These changes put the couchbase dependency in a state where it can be
re-introduced to the CI tests.

* Couchbase: Re-enable testing

Prior to this change, Couchbase tests were disabled due to constant
failures and flaky tests.

Recent changes have fixed the testing issues by:
* Upgrading Couchbase server from 6.0.1 to 6.6.5
* Updating the versions of Couchbase client we use to test

This change re-enables testing the Couchbase integration now that tests
are working and stable.
tlhunter pushed a commit that referenced this pull request Jul 21, 2023
* Couchbase: Update Docker Container repo

This repo uses a slightly modified version of the Couchbase docker image
for testing. This modified version is required to do some base
configuration of the Couchbase container (such as password setup, memory
settings, and more).

Prior to this change, we used a container image/repo owned by Sam
Brenner (sabrenner).  This change forks the sabrenner repository and
adds the container to DataDog's github container repository.

* Couchbase: update tested versions

This change updates several of the versions of Couchbase which we test
against.  In particular:

* 2.6.12 replaces 2.6.5 due to an inability to compile 2.6.5 in the
  latest Node releases
* 3.0.7 replaces 3.0.0 due to test timeout issues causing flakiness
* 3.1.2 replaces 3.1.0 due to test timeout issues causing flakiness

These changes put the couchbase dependency in a state where it can be
re-introduced to the CI tests.

* Couchbase: Re-enable testing

Prior to this change, Couchbase tests were disabled due to constant
failures and flaky tests.

Recent changes have fixed the testing issues by:
* Upgrading Couchbase server from 6.0.1 to 6.6.5
* Updating the versions of Couchbase client we use to test

This change re-enables testing the Couchbase integration now that tests
are working and stable.
@tlhunter tlhunter deleted the teague.bick/couchbase branch January 19, 2024 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants