Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/go_modules/instrumentation/gori…
Browse files Browse the repository at this point in the history
…lla/mux/github.com/stretchr/testify-1.6.1
  • Loading branch information
evantorrie committed Jun 22, 2020
2 parents cbe2177 + 9f68b4e commit 445e171
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 4 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Dependabot-Tidier
on:
pull_request:
types: [ labeled ]

jobs:
mod_tidier:
if: ${{ contains(github.event.pull_request.labels.*.name, 'dependencies') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
- uses: actions/setup-go@v2
with:
go-version: '^1.14.0'
- uses: evantorrie/mott-the-tidier@v1-beta
id: modtidy
with:
gomods: '**/go.mod'
gosum_only: true
- uses: stefanzweifel/git-auto-commit-action@v4
id: autocommit
with:
commit_message: Auto-fix go.sum changes in dependent modules
- name: changes
run: |
echo "Changes detected: ${{ steps.autocommit.outputs.changes_detected }}"
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Approvers:

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

Maintainers:
Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/datadog/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module go.opentelemetry.io/contrib/exporters/metric/datadog
go 1.14

require (
github.com/DataDog/datadog-go v3.5.0+incompatible
github.com/DataDog/datadog-go v3.7.2+incompatible
github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7
go.opentelemetry.io/otel v0.6.0
)
4 changes: 2 additions & 2 deletions exporters/metric/datadog/go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/DataDog/datadog-go v3.5.0+incompatible h1:AShr9cqkF+taHjyQgcBcQUt/ZNK+iPq4ROaZwSX5c/U=
github.com/DataDog/datadog-go v3.5.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/DataDog/datadog-go v3.7.2+incompatible h1:o4QtYjBU/rG58VPh8Ne6F65YiMY5/v5q4WdY/HvRYMQ=
github.com/DataDog/datadog-go v3.7.2+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs=
github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60=
github.com/benbjohnson/clock v1.0.0 h1:78Jk/r6m4wCi6sndMpty7A//t4dw/RW5fV4ZgDVfX1w=
Expand Down

0 comments on commit 445e171

Please sign in to comment.