Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ddev/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ platforms = ["linux", "windows"]

[overrides.ci.sqlserver]
platforms = ["windows", "linux"]
runners = { windows = ["windows-2025"] }
runners = { windows = ["windows-2022"] }

[overrides.ci.tcp_check]
platforms = ["linux", "windows"]
Expand Down
141 changes: 70 additions & 71 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3626,7 +3626,7 @@ jobs:
job-name: SQL Server on Windows
target: sqlserver
platform: windows
runner: '["windows-2025"]'
runner: '["windows-2022"]'
repo: "${{ inputs.repo }}"
python-version: "${{ inputs.python-version }}"
standard: ${{ inputs.standard }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test-target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ jobs:
- name: Run Unit & Integration tests
if: inputs.standard && !inputs.minimum-base-package
env:
DDEV_TEST_ENABLE_TRACING: "${{ inputs.repo == 'core' && '1' || '0' }}"
# TODO: SQL Server on Windows crashes when tracing is enabled with error File Windows fatal exception: access violation
DDEV_TEST_ENABLE_TRACING: "${{ inputs.repo == 'core' && (inputs.target != 'sqlserver' || inputs.platform != 'windows') && '1' || '0' }}"
run: |
if [ '${{ inputs.pytest-args }}' = '-m flaky' ]; then
set +e # Disable immediate exit
Expand Down Expand Up @@ -352,7 +353,8 @@ jobs:
if: inputs.latest
env:
DD_API_KEY: "${{ secrets.DD_API_KEY }}"
DDEV_TEST_ENABLE_TRACING: "${{ inputs.repo == 'core' && '1' || '0' }}"
# TODO: SQL Server on Windows crashes when tracing is enabled with error File Windows fatal exception: access violation
DDEV_TEST_ENABLE_TRACING: "${{ inputs.repo == 'core' && (inputs.target != 'sqlserver' || inputs.platform != 'windows') && '1' || '0' }}"
run: |
# '-- all' is passed for e2e tests if pytest args are provided
# This is done to avoid ddev from interpreting the arguments as environments
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"id": 7049054880430209,
"definition": {
"type": "note",
"content": "**[Bitwarden](https://bitwarden.com/)** password manager generates, stores, and secures important digital assets in an end-to-end encrypted vault. Users can access their data from anywhere, on any device (desktop, laptop, mobile devices) with secure cloud syncing or self-hosted deployment.\n\nThis dashboard provides visibility into activities related to the organization and its users.\n\nFor more information, see the [Bitwarden Integration Documentation](https://docs.datadoghq.comintegrations/bitwarden/).\n\n**Tips**\n- Use the timeframe selector in the top right of the dashboard to change the default timeframe.\n- Clone this dashboard to rearrange, modify and add widgets and visualizations. ",
"content": "**[Bitwarden](https://bitwarden.com/)** password manager generates, stores, and secures important digital assets in an end-to-end encrypted vault. Users can access their data from anywhere, on any device (desktop, laptop, mobile devices) with secure cloud syncing or self-hosted deployment.\n\nThis dashboard provides visibility into activities related to the organization and its users.\n\nFor more information, see the [Bitwarden Integration Documentation](https://docs.datadoghq.com/integrations/bitwarden/).\n\n**Tips**\n- Use the timeframe selector in the top right of the dashboard to change the default timeframe.\n- Clone this dashboard to rearrange, modify and add widgets and visualizations. ",
"background_color": "vivid_blue",
"font_size": "14",
"text_align": "left",
Expand Down
1 change: 1 addition & 0 deletions datadog_checks_dev/changelog.d/20817.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update required owner of logs files
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

DIRECTORY_REGEX = re.compile(r"\/(.*)\/$")

LOGS_TEAM = '@DataDog/logs-backend'
LOGS_TEAM = '@DataDog/logs-integrations-reviews'

# Integrations that are known to be tiles and have email-based codeowners
IGNORE_TILES = {
Expand Down
1 change: 1 addition & 0 deletions mongo/changelog.d/20834.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix incorrect UTC timestamp parsing for system.profile slow queries when the agent runs in non-UTC timezones.
4 changes: 2 additions & 2 deletions mongo/datadog_checks/mongo/dbm/slow_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import binascii
import time
from datetime import datetime
from datetime import datetime, timezone

from bson import json_util
from cachetools import TTLCache
Expand Down Expand Up @@ -158,7 +158,7 @@ def _collect_slow_operations_from_profiler(self, db_name, last_ts):
for profile in profiling_data:
if 'command' not in profile:
continue
profile["ts"] = profile["ts"].timestamp() # convert datetime to timestamp
profile["ts"] = profile["ts"].replace(tzinfo=timezone.utc).timestamp() # convert datetime to timestamp
yield self._obfuscate_slow_operation(profile, db_name)

def _collect_slow_operations_from_logs(self, db_names, last_ts):
Expand Down
11 changes: 11 additions & 0 deletions mongo/hatch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,20 @@ python = ["3.12"]
version = ["4.4", "5.0", "6.0", "7.0", "8.0"]
flavor = ["standalone", "shard", "auth", "tls"]

# test the compatibility of mongo running on non-utc timezone
[[envs.default.matrix]]
python = ["3.12"]
version = ["8.0"]
flavor = ["standalone"]
tz = ["newyork"]

[envs.default.overrides]
matrix.version.env-vars = "MONGO_VERSION"
matrix.tz.env-vars = [
{ key = "TZ", value = "America/New_York", if = ["newyork"] },
]

[envs.default.env-vars]
COMPOSE_FILE = "mongo-{matrix:flavor}.yaml"
DDEV_SKIP_GENERIC_TAGS_CHECK = "true"
TZ="UTC"
2 changes: 2 additions & 0 deletions mongo/tests/compose/mongo-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ services:
networks:
- mongo-standalone
command: mongod --port 27017 --bind_ip=0.0.0.0
environment:
- TZ=${TZ}
ports:
- "27017:27017"

Expand Down
4 changes: 2 additions & 2 deletions sqlserver/tests/test_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,8 @@ def test_connection_failure(aggregator, dd_run_check, instance_docker):
"failed_tcp_connection",
{"host": "localhost,9999"},
{
"odbc-windows|MSOLEDBSQL": "TCP Provider: No connection could be made"
" because the target machine actively refused it",
"odbc-windows|MSOLEDBSQL": "(TCP Provider: No connection could be made"
" because the target machine actively refused it|TCP Provider: The wait operation timed out)",
"SQLOLEDB|SQLNCLI11": "TCP-connection\\(ERROR: No connection could be made "
"because the target machine actively refused it\\).*"
"could not open database requested by login",
Expand Down
Loading