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

Add SQLSRV Integration #2031

Merged
merged 32 commits into from
May 8, 2023
Merged

Add SQLSRV Integration #2031

merged 32 commits into from
May 8, 2023

Conversation

PROFeNoM
Copy link
Contributor

@PROFeNoM PROFeNoM commented May 2, 2023

Description

This PR adds a SQLSRV Integration. Moreover, it will change the buster dockerfiles to include the required drivers (these images have already been pushed to datadog/dd-trace-ci)

Readiness checklist

  • (only for Members) Changelog has been added to the release document.
  • Tests added for this feature/bug.

Reviewer checklist

  • Appropriate labels assigned.
  • Milestone is set.
  • Changelog has been added to the release document. For community contributors the reviewer is in charge of this task.

@PROFeNoM PROFeNoM requested a review from a team as a code owner May 2, 2023 06:31
@PROFeNoM PROFeNoM self-assigned this May 2, 2023
Copy link
Collaborator

@pierotibou pierotibou left a comment

Choose a reason for hiding this comment

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

LGTM, thanks


$integration->detectError($hook->returned, $span);
});
} else {
Copy link
Collaborator

Choose a reason for hiding this comment

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

In theory, as we're only in maintenance mode for PHP5, you didn't have to do this. But no worries if it is done now

Copy link
Collaborator

Choose a reason for hiding this comment

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

(It just has no effect on PHP 5 as it's not declared in the IntegrationsLoader for PHP 5)

@PROFeNoM PROFeNoM added this to the 0.87.0 milestone May 2, 2023

protected function setMetricNumRows(SpanData $span, $stmt)
{
if ($stmt) {
Copy link
Collaborator

@bwoebi bwoebi May 5, 2023

Choose a reason for hiding this comment

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

If there's no num_rows, can you please assign sqlsrv_rows_affected() to db.row_count? (like in the PDO integration, where both are merged into the same function incidentally; the mysqlintegration is a bit wrong on that.)

Copy link
Collaborator

@bwoebi bwoebi left a comment

Choose a reason for hiding this comment

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

Generally looks good to me.

I'm just a bit confused where the logic is to not build sqlsrv on arm64 for older versions? I thought we found that the sqlsrv extension does not work on older PHP versions with arm64, or do I misremember?

@bwoebi bwoebi merged commit b3044bd into master May 8, 2023
469 of 474 checks passed
@bwoebi bwoebi deleted the alex/integration/sqlsrv branch May 8, 2023 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants