Skip to content

[DBMON-6807] Add MariaDB 12 and 13 support - #24301

Open
sethsamuel wants to merge 7 commits into
masterfrom
seth.samuel/DBMON-6807-add-mariadb-12-13-support
Open

[DBMON-6807] Add MariaDB 12 and 13 support#24301
sethsamuel wants to merge 7 commits into
masterfrom
seth.samuel/DBMON-6807-add-mariadb-12-13-support

Conversation

@sethsamuel

@sethsamuel sethsamuel commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

What does this PR do?

  • Adds support for MariaDB 12 and 13
  • Updates to support main release for 13

Motivation

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Add qa/required if this PR needs QA validation, or qa/skip-qa if it does not. Exactly one of the two is required.
  • If you need to backport this PR to another branch, you can add the backport/<branch-name> label to the PR and it will automatically open a backport PR once this one is merged

- 12.0: added to the mariadb-flavor matrix (bitnamilegacy image).
- 13: RC-only and absent from bitnamilegacy, so route to the official mariadb
  image via a new MYSQL_IMAGE_TAG mechanism (mirrors POSTGRES_IMAGE_TAG),
  pinned to 13.0-rc, with a dedicated official-image compose (percona-style
  initdb replication). Official-image compose flagged for CI validation.
- Sync CI config (ddev validate ci --sync).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@datadog-official

datadog-official Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Tests  Code Coverage

🎉 All green!

🧪 All tests passed
❄️ No new flaky tests detected

🎯 Code Coverage (details)
Patch Coverage: 65.22%
Overall Coverage: 89.51% (+1.10%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 3a9afab | Docs | Datadog PR Page | Give us feedback!

sethsamuel and others added 3 commits July 2, 2026 09:05
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
The PR only touches the test matrix and test fixtures (hatch.toml,
tests/); no Agent-shipped file changes, so per the changelog guidelines
this needs no changelog entry.

Environment: Datadog workspace

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
MariaDB 13 runs on the official mariadb image, which requires a root password
(MARIADB_ROOT_PASSWORD=mypass) unlike the bitnami image used for 12.0 and older.
Add a shared common.mysql_root_password() helper (covering the official mysql and
mariadb images plus percona/group/hybrid) and route all root connections through
it so 13 authenticates while 12.0 and older stay empty.

Also make the version_metadata fixture tolerate a major-only version tag ("13"):
minor falls back to mock.ANY when the tag has no minor component.

Environment: Datadog workspace

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@sethsamuel sethsamuel added the qa/skip-qa Automatically skip this PR for the next QA label Jul 2, 2026
In E2E runs TempDir reuses the same host logs directory across `env start` and
`env test`. The official mariadb image (MariaDB 13) can chown the bind-mounted
logs directory to its own uid during startup, so on the second setup the
re-chmod from the test user fails with EPERM and errors out env setup. The
directory permissions were already applied on first creation, so skip the
chmod when it is no longer permitted. Kept identical to the MySQL 9 branch.

Environment: Datadog workspace

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@sethsamuel
sethsamuel marked this pull request as ready for review July 6, 2026 13:42
@sethsamuel
sethsamuel requested review from a team as code owners July 6, 2026 13:42

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3b4a083472

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

ports:
- "${MYSQL_PORT}:3306"
volumes:
- ${MYSQL_LOGS_HOST_PATH}:${MYSQL_LOGS_PATH}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Make the official MariaDB log mount writable

In the new official-image path, ${MYSQL_LOGS_HOST_PATH} is the host-owned TempDir from dd_environment, which is only chmodded to 0770; the official MariaDB entrypoint drops to its internal mysql user after chowning the datadir/socket, not this extra log bind mount. Because the new config forces general and slow logs under /var/log/mysql, the py3.13-mariadb-13 containers on Linux CI cannot create/open mysql.log and mysql_slow.log unless that host directory is made writable for the container user, so the new matrix entry can fail at startup or lose the log collection it is trying to validate.

Useful? React with 👍 / 👎.

@dd-octo-sts

dd-octo-sts Bot commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

Validation Report

All 21 validations passed.

Show details
Validation Description Status
agent-reqs Verify check versions match the Agent requirements file
ci Validate CI configuration and code coverage settings
codeowners Validate every integration has a CODEOWNERS entry
config Validate default configuration files against spec.yaml
dep Verify dependency pins are consistent and Agent-compatible
http Validate integrations use the HTTP wrapper correctly
imports Validate check imports do not use deprecated modules
integration-style Validate check code style conventions
jmx-metrics Validate JMX metrics definition files and config
labeler Validate PR labeler config matches integration directories
legacy-signature Validate no integration uses the legacy Agent check signature
license-headers Validate Python files have proper license headers
licenses Validate third-party license attribution list
metadata Validate metadata.csv metric definitions
models Validate configuration data models match spec.yaml
openmetrics Validate OpenMetrics integrations disable the metric limit
package Validate Python package metadata and naming
qa-label Validate the pull request declares whether it needs QA for the next Agent release
readmes Validate README files have required sections
saved-views Validate saved view JSON file structure and fields
version Validate version consistency between package and changelog

View full run

@cit-pr-commenter-54b7da

Copy link
Copy Markdown

evalya-impact-summary

evalya impact analysis
Impact analysis: 0 selected, 0 skipped (of 0 test tasks)
Publish tasks:   0 (always emitted)
Diff (10 files):
  .github/workflows/test-all.yml
  mysql/hatch.toml
  mysql/tests/common.py
  mysql/tests/compose/mariadb-official-primary.conf
  mysql/tests/compose/mariadb-official-replica.conf
  mysql/tests/compose/mariadb-official.yaml
  mysql/tests/compose/mariadb_official_primary_initdb/01_replication.sql
  mysql/tests/compose/mariadb_official_replica_initdb/01_replication.sql
  mysql/tests/conftest.py
  mysql/tests/test_query_activity.py

Debug a specific task: evalya plan impact --path <path> --task <task>

Learn more about CI impact filtering

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.

2 participants