Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dependabot/composer/drupal/monol…
Browse files Browse the repository at this point in the history
…og-3.0.2' into dependabot/composer/drupal/monolog-3.0.2

# Conflicts:
#	composer.lock
  • Loading branch information
edmund-dunn committed Feb 21, 2024
2 parents 0d554d5 + 881b538 commit bc96080
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/default-branch-datadog-metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
env:
GITHUB_REPOSITORY: "${{ github.repository }}"
- name: Send Metrics to DataDog.
uses: masci/datadog@68f124e429317cc02e17965df6d08c75056cb45d # v1.6.0
uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1
with:
api-key: ${{ secrets.DATADOG_API_KEY }}
api-url: https://api.ddog-gov.com
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
echo "Lines Denominator: ${lines_denominator}";
- name: Send Metrics to DataDog.
uses: masci/datadog@68f124e429317cc02e17965df6d08c75056cb45d # v1.6.0
uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1
with:
api-key: ${{ secrets.DATADOG_API_KEY }}
api-url: https://api.ddog-gov.com
Expand Down Expand Up @@ -271,7 +271,7 @@ jobs:
echo "nonpublic_class_constants=$(jq '.nonPublicClassConstants' phploc.json)" >> $GITHUB_OUTPUT
- name: Send Metrics to DataDog.
uses: masci/datadog@68f124e429317cc02e17965df6d08c75056cb45d # v1.6.0
uses: masci/datadog@a5d283e78e33a688ed08a96ba64440505e645a8c # v1.7.1
with:
api-key: ${{ secrets.DATADOG_API_KEY }}
api-url: https://api.ddog-gov.com
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"composer/installers": "^2.2",
"consolidation/site-process": "^5.2",
"cweagans/composer-patches": "^1.7",
"datadog/dd-trace": "^0.97.0",
"datadog/dd-trace": "^0.98.0",
"dealerdirect/phpcodesniffer-composer-installer": "0.7.2",
"drupal/address": "^1.4",
"drupal/admin_feedback": "^2.2",
Expand Down
12 changes: 6 additions & 6 deletions composer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1175,16 +1175,16 @@
},
{
"name": "datadog/dd-trace",
"version": "0.97.0",
"version": "0.98.0",
"source": {
"type": "git",
"url": "https://github.com/DataDog/dd-trace-php.git",
"reference": "e76850105e99ba5d5b36697b3e4553ee70cfdae9"
"reference": "b25dc1e3fc8e8f3906e183fed5ed62d3aac19381"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/DataDog/dd-trace-php/zipball/e76850105e99ba5d5b36697b3e4553ee70cfdae9",
"reference": "e76850105e99ba5d5b36697b3e4553ee70cfdae9",
"url": "https://api.github.com/repos/DataDog/dd-trace-php/zipball/b25dc1e3fc8e8f3906e183fed5ed62d3aac19381",
"reference": "b25dc1e3fc8e8f3906e183fed5ed62d3aac19381",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -1273,9 +1273,9 @@
],
"support": {
"issues": "https://github.com/DataDog/dd-trace-php/issues",
"source": "https://github.com/DataDog/dd-trace-php/tree/0.97.0"
"source": "https://github.com/DataDog/dd-trace-php/tree/0.98.0"
},
"time": "2024-01-18T10:15:17+00:00"
"time": "2024-02-19T18:55:36+00:00"
},
{
"name": "davedevelopment/stiphle",
Expand Down

0 comments on commit bc96080

Please sign in to comment.