Skip to content

Commit 753df94

Browse files
authored
Merge branch 'master' into dependabot/go_modules/exporters/metric/dogstatsd/github.com/stretchr/testify-1.6.1
2 parents 037a91a + 9f68b4e commit 753df94

File tree

4 files changed

+32
-4
lines changed

4 files changed

+32
-4
lines changed

.github/workflows/dependabot.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Dependabot-Tidier
2+
on:
3+
pull_request:
4+
types: [ labeled ]
5+
6+
jobs:
7+
mod_tidier:
8+
if: ${{ contains(github.event.pull_request.labels.*.name, 'dependencies') }}
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
with:
13+
ref: ${{ github.head_ref }}
14+
- uses: actions/setup-go@v2
15+
with:
16+
go-version: '^1.14.0'
17+
- uses: evantorrie/mott-the-tidier@v1-beta
18+
id: modtidy
19+
with:
20+
gomods: '**/go.mod'
21+
gosum_only: true
22+
- uses: stefanzweifel/git-auto-commit-action@v4
23+
id: autocommit
24+
with:
25+
commit_message: Auto-fix go.sum changes in dependent modules
26+
- name: changes
27+
run: |
28+
echo "Changes detected: ${{ steps.autocommit.outputs.changes_detected }}"

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Approvers:
110110

111111
- [Liz Fong-Jones](https://github.com/lizthegrey), Honeycomb
112112
- [Gustavo Silva Paiva](https://github.com/paivagustavo), Stilingue
113-
- [Evan Torrie](https://github.com/evantorrie), Comcast
113+
- [Evan Torrie](https://github.com/evantorrie), Verizon Media
114114
- [Anthony Mirabella](https://github.com/Aneurysm9), Centene
115115

116116
Maintainers:

exporters/metric/datadog/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module go.opentelemetry.io/contrib/exporters/metric/datadog
33
go 1.14
44

55
require (
6-
github.com/DataDog/datadog-go v3.5.0+incompatible
6+
github.com/DataDog/datadog-go v3.7.2+incompatible
77
github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7
88
go.opentelemetry.io/otel v0.6.0
99
)

exporters/metric/datadog/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
22
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3-
github.com/DataDog/datadog-go v3.5.0+incompatible h1:AShr9cqkF+taHjyQgcBcQUt/ZNK+iPq4ROaZwSX5c/U=
4-
github.com/DataDog/datadog-go v3.5.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
3+
github.com/DataDog/datadog-go v3.7.2+incompatible h1:o4QtYjBU/rG58VPh8Ne6F65YiMY5/v5q4WdY/HvRYMQ=
4+
github.com/DataDog/datadog-go v3.7.2+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
55
github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs=
66
github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60=
77
github.com/benbjohnson/clock v1.0.0 h1:78Jk/r6m4wCi6sndMpty7A//t4dw/RW5fV4ZgDVfX1w=

0 commit comments

Comments
 (0)