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.

Sign up for GitHub

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

Jump to bottom

chore(mariadb): update tests to support mariadb>=1.1.0 #3883

Merged
merged 5 commits into from
Jun 30, 2022
Merged

chore(mariadb): update tests to support mariadb>=1.1.0 #3883

merged 5 commits into from
Jun 30, 2022

Conversation

brettlangdon
Copy link
Member

@brettlangdon brettlangdon commented Jun 29, 2022 •
edited by mabdinur
Loading

Description

The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Checklist

Reviewer Checklist

  • Title is accurate.
  • Description motivates each change.
  • No unnecessary changes were introduced in this PR.
  • PR cannot be broken up into smaller PRs.
  • Avoid breaking API changes unless absolutely necessary.
  • Tests provided or description of manual testing performed is included in the code or PR.
  • Release note has been added for fixes and features, or else changelog/no-changelog label added.
  • All relevant GitHub issues are correctly linked.
  • Backports are identified and tagged with Mergifyio.
  • Add to milestone.

@brettlangdon brettlangdon added the changelog/no-changelog A changelog entry is not required for this PR. label Jun 29, 2022
@brettlangdon brettlangdon requested a review from a team as a code owner June 29, 2022 18:37
@brettlangdon brettlangdon mentioned this pull request Jun 29, 2022
Merged
14 tasks
P403n1x87
P403n1x87 previously approved these changes Jun 30, 2022
View reviewed changes
mabdinur
mabdinur previously approved these changes Jun 30, 2022
View reviewed changes
mabdinur
mabdinur reviewed Jun 30, 2022
View reviewed changes
Copy link
Contributor

@mabdinur mabdinur left a comment

Choose a reason for hiding this comment

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

There's one failing snapshot test: https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/18500/workflows/292f8a02-691a-413b-a41b-a13fdbea0663/jobs/1252318

@mabdinur mabdinur self-requested a review June 30, 2022 13:47
Kyle-Verhoog pushed a commit that referenced this pull request Jun 30, 2022
@brettlangdon
chore(ci): install official MariaDB C headers in dev image (#3884)
a74271d 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updated our development docker image to install latest MariaDB C connector headers

#3883 is a follow-up PR to update the snapshot files / fix the MariaDB tests.
@brettlangdon brettlangdon changed the title chore(mariadb): update dev image/tests to support mariadb>=1.1.0 chore(mariadb): update tests to support mariadb>=1.1.0 Jun 30, 2022
@brettlangdon
Copy link
Member Author

There's one failing snapshot test: https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/18500/workflows/292f8a02-691a-413b-a41b-a13fdbea0663/jobs/1252318

Yeah, this needed the dev image updates to get merged first. #3884 has been merged so this PR should be good now

@Kyle-Verhoog @mabdinur
Update tests/snapshots/tests.contrib.mariadb.test_mariadb.test_simple…
5098cde 
…_malformed_query_snapshot_pre_1_1.json

Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
@Kyle-Verhoog Kyle-Verhoog dismissed stale reviews from mabdinur and P403n1x87 via 5098cde June 30, 2022 19:03
@Kyle-Verhoog Kyle-Verhoog merged commit 22746a3 into 1.x Jun 30, 2022
@Kyle-Verhoog Kyle-Verhoog deleted the brettlangdon/fix.mariadb.tests branch June 30, 2022 20:01
@github-actions github-actions bot added this to the v1.3.0 milestone Jun 30, 2022
@Kyle-Verhoog
Copy link
Member

@Mergifyio backport 1.2 1.1 1.0 0.x

mergify bot pushed a commit that referenced this pull request Jul 1, 2022
@brettlangdon @mergify
chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)
2aefd8d 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)
@mergify mergify bot mentioned this pull request Jul 1, 2022
Merged
mergify bot pushed a commit that referenced this pull request Jul 1, 2022
@brettlangdon @mergify
chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)
4ab5bfb 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)
@mergify mergify bot mentioned this pull request Jul 1, 2022
Merged
mergify bot pushed a commit that referenced this pull request Jul 1, 2022
@brettlangdon @mergify
chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)
8c11f3f 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)
@mergify mergify bot mentioned this pull request Jul 1, 2022
Merged
mergify bot pushed a commit that referenced this pull request Jul 1, 2022
@brettlangdon @mergify
chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)
a5b0f95 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)

# Conflicts:
#	tests/contrib/mariadb/test_mariadb.py
@mergify mergify bot mentioned this pull request Jul 1, 2022
Merged
@mergify
Copy link
Contributor

mergify bot commented Jul 1, 2022

backport 1.2 1.1 1.0 0.x

✅ Backports have been created

Kyle-Verhoog pushed a commit that referenced this pull request Jul 1, 2022
@mergify @brettlangdon
chore(mariadb): update tests to support mariadb>=1.1.0 (#3883) (#3898)
48656a0 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
mergify bot pushed a commit that referenced this pull request Jul 5, 2022
@brettlangdon @mergify
chore(ci): install official MariaDB C headers in dev image (#3884)
ef3d294 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updated our development docker image to install latest MariaDB C connector headers

#3883 is a follow-up PR to update the snapshot files / fix the MariaDB tests.

(cherry picked from commit a74271d)
mergify bot pushed a commit that referenced this pull request Jul 5, 2022
@brettlangdon @mergify
chore(ci): install official MariaDB C headers in dev image (#3884)
554b8a2 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updated our development docker image to install latest MariaDB C connector headers

#3883 is a follow-up PR to update the snapshot files / fix the MariaDB tests.

(cherry picked from commit a74271d)

# Conflicts:
#	docker/Dockerfile.buster
mergify bot pushed a commit that referenced this pull request Jul 5, 2022
@brettlangdon @mergify
chore(ci): install official MariaDB C headers in dev image (#3884)
ada3c30 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updated our development docker image to install latest MariaDB C connector headers

#3883 is a follow-up PR to update the snapshot files / fix the MariaDB tests.

(cherry picked from commit a74271d)

# Conflicts:
#	docker/Dockerfile.buster
Kyle-Verhoog added a commit that referenced this pull request Jul 7, 2022
@mergify @brettlangdon @Kyle-Verhoog
chore(mariadb): update tests to support mariadb>=1.1.0 (#3883) (#3899)
c748c2b 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
brettlangdon added a commit that referenced this pull request Jul 7, 2022
@mergify @brettlangdon @Kyle-Verhoog
chore(mariadb): update tests to support mariadb>=1.1.0 (#3883) (#3900)
2b3c031 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Kyle-Verhoog pushed a commit that referenced this pull request Jul 7, 2022
@mergify
chore(mariadb): update tests to support mariadb>=1.1.0 (backport #3883)…
3db913e 
… (#3901)

* chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)

The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)
mergify bot added a commit that referenced this pull request Oct 27, 2022
@mergify
chore(mariadb): update tests to support mariadb>=1.1.0 (backport #3883)…
c3b334b 
… (#3901)

* chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)

The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)
(cherry picked from commit 3db913e)

# Conflicts:
#	tests/contrib/mariadb/test_mariadb.py
@mabdinur
Copy link
Contributor

@Mergifyio backport 0.61

@mergify mergify bot mentioned this pull request Oct 27, 2022
Merged
mergify bot pushed a commit that referenced this pull request Oct 27, 2022
@brettlangdon @mergify
chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)
2c171d1 
The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)

# Conflicts:
#	tests/contrib/mariadb/test_mariadb.py
@mergify
Copy link
Contributor

mergify bot commented Oct 27, 2022

backport 0.61

✅ Backports have been created

Kyle-Verhoog pushed a commit that referenced this pull request Oct 27, 2022
@mergify @brettlangdon @mabdinur
chore(mariadb): update tests to support mariadb>=1.1.0 (backport #3883)…
567bbb4 
… (#4401)

* chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)

The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)

# Conflicts:
#	tests/contrib/mariadb/test_mariadb.py

* fix conflicts and add missing snapshots

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
Kyle-Verhoog pushed a commit that referenced this pull request Oct 27, 2022
@mergify @brettlangdon @mabdinur
chore(ci): pin mariadb container to 10.7 image tag (backport #3913) (#…
9de953d 
…4395)

* chore(ci): pin mariadb container to 10.7 image tag (#3913)

MariaDB latest only works on newer versions of Docker (see MariaDB/mariadb-docker#434).

So we are pinning to mariadb:10.7 for now to ensure consistent startup of the container in CircleCI.

(cherry picked from commit 27a55df)

* chore(mariadb): update tests to support mariadb>=1.1.0 (backport #3883) (#4401)

* chore(mariadb): update tests to support mariadb>=1.1.0 (#3883)

The latest version of mariadb client library requires a newer version of the C library in order to build.

This PR updates snapshot tests to account for newly supported db.rowcount for mariadb query spans.

This PR depends on #3884 to be merged and update our dev image first before this can pass.

This is a testing only fix, our integration continues to work fine for mariadb>=1.1.0, but our test suite was not setup for it.

Co-authored-by: Kyle Verhoog <kyle@verhoog.ca>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
(cherry picked from commit 22746a3)

# Conflicts:
#	tests/contrib/mariadb/test_mariadb.py

* fix conflicts and add missing snapshots

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>

Co-authored-by: Brett Langdon <brett.langdon@datadoghq.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Munir Abdinur <munir_abdinur@hotmail.com>
Co-authored-by: Munir Abdinur <munir.abdinur@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mabdinur mabdinur mabdinur left review comments

@Kyle-Verhoog Kyle-Verhoog Kyle-Verhoog approved these changes

@P403n1x87 P403n1x87 P403n1x87 left review comments

Assignees
No one assigned
Labels
changelog/no-changelog A changelog entry is not required for this PR.
Projects
None yet
Milestone
v1.3.0
Development

Successfully merging this pull request may close these issues.
4 participants
@brettlangdon @Kyle-Verhoog @mabdinur @P403n1x87