Skip to content

[pull] master from DataDog:master #69

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

Merged
pull merged 7 commits into from
Aug 13, 2025
Merged

[pull] master from DataDog:master #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e350bb4
[Tibco EMS] Fix collection of queues with a `none` prefetch value (#2…
dkirov-dd Aug 13, 2025
91c9630
Fix Workflow by removing variable (#21045)
steveny91 Aug 13, 2025
5a21c3a
Fix type of otel.system.memory.usage (#20915)
angristan Aug 13, 2025
dee43a2
[DSM] Move the DSM callout above the JMX notice in Kafka Broker confi…
lkretvix Aug 13, 2025
9eea18f
[IXP-564] Re-sync the latest set of metric metadata units (#21048)
nmuesch Aug 13, 2025
74f0757
Update IIS Dashboard to remove fixed time periods (#21044)
shanelhuang Aug 13, 2025
c0ea266
add source to sqlserver integration dashboard (#21022)
anbnyc Aug 13, 2025
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
12 changes: 4 additions & 8 deletions .github/workflows/test-target.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,8 @@ jobs:
# This is not required when no pytest args are provided and it will run all environments
# by default
set +e # Disable immediate exit
PYTEST_ARGS='${{ inputs.pytest-args }}'

if [ "$PYTEST_ARGS" = '-m flaky' ] || [ "$PYTEST_ARGS" = '-m "not flaky"' ]; then
ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- $PYTEST_ARGS -k "not fips"
if [ '${{ inputs.pytest-args }}' = '-m flaky' ] || [ '${{ inputs.pytest-args }}' = '-m "not flaky"' ]; then
ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- ${{ inputs.pytest-args }} -k "not fips"
exit_code=$?
else
ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} ${{ inputs.pytest-args != '' && format('-- {0} -k "not fips"', inputs.pytest-args) || '-- -k "not fips"' }}
Expand All @@ -305,10 +303,8 @@ jobs:
# This is not required when no pytest args are provided and it will run all environments
# by default
set +e # Disable immediate exit
PYTEST_ARGS='${{ inputs.pytest-args }}'

if [ "$PYTEST_ARGS" = '-m flaky' ] || [ "$PYTEST_ARGS" = '-m "not flaky"' ]; then
ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- $PYTEST_ARGS -k "not fips"
if [ '${{ inputs.pytest-args }}' = '-m flaky' ] || [ '${{ inputs.pytest-args }}' = '-m "not flaky"' ]; then
ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- ${{ inputs.pytest-args }} -k "not fips"
exit_code=$?
else
ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} ${{ inputs.pytest-args != '' && format('-- {0} -k "not fips"', inputs.pytest-args) || '-- -k "not fips"' }}
Expand Down
1 change: 1 addition & 0 deletions ddev/changelog.d/21048.added
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated the set of allowed Metric Metadata units with the latest additions
Loading
Loading