Skip to content

Commit

Permalink
chore: update go deps and consolidate workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
boyvinall committed Jan 2, 2024
1 parent c75f6ec commit 65afc30
Show file tree
Hide file tree
Showing 9 changed files with 96 additions and 85 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
container: ghcr.io/tcort/markdown-link-check:stable
steps:
- uses: actions/checkout@v4
- name: Check links
run: |
find . -name '*.md' -exec markdown-link-check '{}' --config mlc_config.json -v ';'
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:
use-verbose-mode: 'yes'
18 changes: 0 additions & 18 deletions .github/workflows/go-docs.yml

This file was deleted.

19 changes: 16 additions & 3 deletions .github/workflows/gh-pages.yml → .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
name: GitHub Pages
name: main

on:
push:
branches:
- main

jobs:
deploy:

go-docs:
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-go@v4
with:
go-version: '1.21'
- name: Refresh pkg.go.dev docs
run: |
go mod init foo
go get github.com/boyvinall/observability-demo/...@main
trigger-github-pages:
runs-on: ubuntu-22.04
permissions:
contents: write
Expand All @@ -27,5 +41,4 @@ jobs:
run: pip install -r requirements.txt

- name: Deploy
if: ${{ github.ref == 'refs/heads/main' }}
run: mkdocs gh-deploy --strict --force
18 changes: 14 additions & 4 deletions .github/workflows/golangci-lint.yml → .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: golangci-lint
name: Push

on:
push:

permissions:
contents: read

jobs:

golangci-lint:
runs-on: ubuntu-22.04
permissions:
contents: read
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
Expand All @@ -17,3 +18,12 @@ jobs:
uses: golangci/golangci-lint-action@v3
with:
version: v1.55.2

markdownlint:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: DavidAnson/markdownlint-cli2-action@v14
with:
globs: 'docs/**/*.md'
config: 'docs/.markdownlint.yaml'
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
bin/
site/
node_modules/
package.json
package-lock.json
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pkgsite
- [ ] Improve [docs](./docs/)
- [ ] Improve [CLI](./cmd/boomer-cli/main.go)
- [ ] Additional/improved provisioned dashboards
- [ ] Improve `Logs to Metrics` in loki [datasource](./docker/datasources/datasources.yml)
- [ ] Improve `Logs to Metrics` in loki [datasource](./config/datasources/datasources.yml)
- [ ] Show usage of influxdb as an event logger, including grafana data links
- [ ] Investigate how to support exemplars from application code – currently it seems the golang SDK doesn't support this, see
[Support exemplars in Prometheus exporter](https://github.com/open-telemetry/opentelemetry-go/issues/3163) and
Expand Down
1 change: 1 addition & 0 deletions docs/.markdownlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ line-length:
ul-indent:
indent: 4 # mkdocs uses Python-Markdown, which requires this to be 4
start_indented: false
showFound: true
36 changes: 18 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/go-rod/rod v0.114.5
github.com/golangci/golangci-lint v1.55.2
github.com/nats-io/nats.go v1.31.0
github.com/prometheus/client_golang v1.17.0
github.com/urfave/cli/v2 v2.26.0
github.com/prometheus/client_golang v1.18.0
github.com/urfave/cli/v2 v2.27.1
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
Expand All @@ -18,10 +18,10 @@ require (
go.opentelemetry.io/otel/sdk v1.21.0
go.opentelemetry.io/otel/sdk/metric v1.21.0
go.opentelemetry.io/otel/trace v1.21.0
golang.org/x/sync v0.4.0
google.golang.org/grpc v1.60.0
golang.org/x/sync v0.5.0
google.golang.org/grpc v1.60.1
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf v1.31.0
google.golang.org/protobuf v1.32.0
)

require (
Expand Down Expand Up @@ -56,7 +56,7 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/charithe/durationcheck v0.0.10 // indirect
github.com/chavacava/garif v0.1.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/curioswitch/go-reassign v0.2.0 // indirect
github.com/daixiang0/gci v0.11.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand Down Expand Up @@ -97,7 +97,7 @@ require (
github.com/gostaticanalysis/comment v1.4.2 // indirect
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
Expand All @@ -111,7 +111,7 @@ require (
github.com/kisielk/errcheck v1.6.3 // indirect
github.com/kisielk/gotool v1.0.0 // indirect
github.com/kkHAIKE/contextcheck v1.1.4 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/kulti/thelper v0.6.3 // indirect
github.com/kunwardeep/paralleltest v1.0.8 // indirect
github.com/kyoh86/exportloopref v0.1.11 // indirect
Expand All @@ -127,14 +127,14 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
github.com/mgechev/revive v1.3.4 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moricho/tparallel v0.3.1 // indirect
github.com/nakabonne/nestif v0.3.1 // indirect
github.com/nats-io/nkeys v0.4.6 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/nishanths/exhaustive v0.11.0 // indirect
github.com/nishanths/predeclared v0.2.2 // indirect
Expand All @@ -145,8 +145,8 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/polyfloyd/go-errorlint v1.4.5 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/quasilyte/go-ruleguard v0.4.0 // indirect
github.com/quasilyte/gogrep v0.5.0 // indirect
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
Expand Down Expand Up @@ -187,13 +187,13 @@ require (
github.com/ultraware/whitespace v0.0.5 // indirect
github.com/uudashr/gocognit v1.1.2 // indirect
github.com/xen0n/gosmopolitan v1.2.2 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
github.com/yagipy/maintidx v1.0.0 // indirect
github.com/yeya24/promlinter v0.2.0 // indirect
github.com/ykadowak/zerologlint v0.1.3 // indirect
github.com/ysmood/fetchup v0.2.3 // indirect
github.com/ysmood/fetchup v0.2.4 // indirect
github.com/ysmood/goob v0.4.0 // indirect
github.com/ysmood/got v0.34.1 // indirect
github.com/ysmood/got v0.38.3 // indirect
github.com/ysmood/gson v0.7.3 // indirect
github.com/ysmood/leakless v0.8.0 // indirect
gitlab.com/bosi/decorder v0.4.1 // indirect
Expand All @@ -208,12 +208,12 @@ require (
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 65afc30

Please sign in to comment.