Skip to content
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

Jump to bottom

chore: Merge v1.59.0 to main in prep for release #1838

Merged
merged 15 commits into from
Sep 3, 2024
Merged

chore: Merge v1.59.0 to main in prep for release #1838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ab2afb4
Update modules to v1.59.0
dpaasman00 Aug 20, 2024
0c1d35e
chore(release): Use 8 core runner (#1810)
jsirianni Aug 20, 2024
8f29093
feat: Add routing connector (#1811)
BinaryFissionGames Aug 21, 2024
a2f6220
feat: custom message based throughput measurements (#1691)
BinaryFissionGames Aug 28, 2024
ef1d027
chore: Test caching to speed up test action (#1812)
dpaasman00 Aug 28, 2024
ced653e
feat: Add okta receiver (#1814)
colelaven Aug 28, 2024
af82bc1
chore: Disable confmap featuregate (#1820)
dpaasman00 Aug 29, 2024
2b7e470
fix(chronicleforwardexporter): Escape newlines in string body (#1818)
kuiperda Aug 29, 2024
89bda3d
fix(plugin): Tomcat plugin has been failing to parse catalina logs du…
Dylan-M Aug 29, 2024
6fdb916
upgrade to go v1.22.6 (#1826)
colelaven Aug 29, 2024
606df9a
chore: Custom .tar.gz and .zip unarchive functions (#1824)
dpaasman00 Aug 30, 2024
7fe37ad
fix(secops): mark non-transient errors as permanent (#1825)
BinaryFissionGames Aug 30, 2024
0955482
deps: Bump OTel to v0.108.0 (#1834)
BinaryFissionGames Sep 3, 2024
b39f874
feat: add webhook event receiver to build (#1835)
BinaryFissionGames Sep 3, 2024
a474c49
deps: Dependabot 09-03-2024 (#1837)
BinaryFissionGames Sep 3, 2024
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: 6 additions & 6 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- name: Cache Tools
id: tool-cache
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- name: Cache Tools
id: tool-cache
Expand All @@ -80,7 +80,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- name: Cache Tools
id: tool-cache
Expand All @@ -104,7 +104,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- name: Cache Tools
id: tool-cache
Expand All @@ -128,7 +128,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- name: Cache Tools
id: tool-cache
Expand All @@ -151,7 +151,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
- name: Plugin Doc Generation
run: make create-plugin-docs
Expand Down
13 changes: 11 additions & 2 deletions .github/workflows/multi_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
uses: actions/setup-go@v5
with:
go-version-file: go.mod
cache-dependency-path: |
go.sum
**/go.sum
- name: Build
run: make build-linux
- name: Scan Third Party Dependency Licenses
Expand All @@ -29,8 +32,11 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
cache-dependency-path: |
go.sum
**/go.sum
- name: Build
run: make build-darwin
- name: Scan Third Party Dependency Licenses
Expand All @@ -45,8 +51,11 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
cache-dependency-path: |
go.sum
**/go.sum
- name: Build
run: make build-windows
- name: Scan Third Party Dependency Licenses
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:

release:
needs: [build-64bit-msi]
runs-on: ubuntu-latest-4-cores
runs-on: ubuntu-latest-8-cores
steps:
- name: Checkout Repo
uses: actions/checkout@v4
Expand All @@ -77,7 +77,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.21"
go-version: "1.22"
check-latest: true
cache-dependency-path: "**/go.sum"
- name: Set up Docker Buildx
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
uses: actions/setup-go@v5
with:
go-version-file: go.mod
cache-dependency-path: |
go.sum
**/go.sum
- name: Run Tests
run: make test
- name: Run Updater Integration Tests (non-linux)
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ release_deps
# OpAmp Files
collector*.yaml
manager*.yaml
logging*.yaml
logging*.yaml
config.yaml
storage
2 changes: 2 additions & 0 deletions .goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ builds:
env:
- CGO_ENABLED=0
mod_timestamp: "{{ .CommitTimestamp }}"
tags:
- bindplane
goos:
- windows
- linux
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ VERSION ?= $(if $(CURRENT_TAG),$(CURRENT_TAG),$(PREVIOUS_TAG))
# Builds just the agent for current GOOS/GOARCH pair
.PHONY: agent
agent:
go build -ldflags "-s -w -X github.com/observiq/bindplane-agent/internal/version.version=$(VERSION)" -o $(OUTDIR)/collector_$(GOOS)_$(GOARCH)$(EXT) ./cmd/collector
go build -ldflags "-s -w -X github.com/observiq/bindplane-agent/internal/version.version=$(VERSION)" -tags bindplane -o $(OUTDIR)/collector_$(GOOS)_$(GOARCH)$(EXT) ./cmd/collector

# Builds just the updater for current GOOS/GOARCH pair
.PHONY: updater
Expand Down Expand Up @@ -123,7 +123,7 @@ test-with-cover:
$(MAKE) for-all CMD="go test -coverprofile=cover.out ./..."
$(MAKE) for-all CMD="go tool cover -html=cover.out -o cover.html"

.PHONY: test-updater-integration
.PHONY: test-updater-integration
test-updater-integration:
cd updater; go test $(INTEGRATION_TEST_ARGS) -race ./...

Expand All @@ -141,7 +141,7 @@ fmt:

.PHONY: tidy
tidy:
$(MAKE) for-all CMD="go mod tidy -compat=1.21"
$(MAKE) for-all CMD="go mod tidy -compat=1.22"

.PHONY: gosec
gosec:
Expand Down Expand Up @@ -247,7 +247,7 @@ release:
@if ! [[ "$(version)" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$$ ]]; then \
echo "version $(version) is invalid semver"; \
exit 1; \
fi
fi

@git tag $(version)
@git push --tags
Expand Down
75 changes: 41 additions & 34 deletions cmd/plugindocgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
module github.com/observiq/bindplane-agent/plugindocgen

go 1.21.9
go 1.22.6

require (
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.58.3
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.59.0
github.com/spf13/pflag v1.0.5
gopkg.in/yaml.v3 v3.0.1
)

require (
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/compute/metadata v0.4.0 // indirect
github.com/apache/arrow/go/v15 v15.0.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/knadh/koanf/v2 v2.1.1 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
Expand All @@ -33,42 +35,47 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.108.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_golang v1.20.2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/shirou/gopsutil/v4 v4.24.7 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.etcd.io/bbolt v1.3.10 // indirect
go.opentelemetry.io/collector v0.107.0 // indirect
go.opentelemetry.io/collector/component v0.107.0 // indirect
go.opentelemetry.io/collector/component/componentprofiles v0.107.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
go.opentelemetry.io/collector/confmap v0.107.0 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.107.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.107.0 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.107.0 // indirect
go.opentelemetry.io/collector/connector v0.107.0 // indirect
go.opentelemetry.io/collector/consumer v0.107.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
go.opentelemetry.io/collector/exporter v0.107.0 // indirect
go.opentelemetry.io/collector/extension v0.107.0 // indirect
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
go.opentelemetry.io/collector/otelcol v0.107.0 // indirect
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
go.opentelemetry.io/collector/processor v0.107.0 // indirect
go.opentelemetry.io/collector/receiver v0.107.0 // indirect
go.opentelemetry.io/collector/semconv v0.107.0 // indirect
go.opentelemetry.io/collector/service v0.107.0 // indirect
go.etcd.io/bbolt v1.3.11 // indirect
go.opentelemetry.io/collector v0.108.1 // indirect
go.opentelemetry.io/collector/component v0.108.1 // indirect
go.opentelemetry.io/collector/component/componentprofiles v0.108.1 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.108.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.108.1 // indirect
go.opentelemetry.io/collector/confmap v1.14.1 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.108.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.108.1 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.108.0 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.108.0 // indirect
go.opentelemetry.io/collector/connector v0.108.1 // indirect
go.opentelemetry.io/collector/consumer v0.108.1 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.108.1 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.108.1 // indirect
go.opentelemetry.io/collector/exporter v0.108.1 // indirect
go.opentelemetry.io/collector/extension v0.108.1 // indirect
go.opentelemetry.io/collector/featuregate v1.14.1 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.108.1 // indirect
go.opentelemetry.io/collector/otelcol v0.108.1 // indirect
go.opentelemetry.io/collector/pdata v1.14.1 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.108.1 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.108.1 // indirect
go.opentelemetry.io/collector/processor v0.108.1 // indirect
go.opentelemetry.io/collector/receiver v0.108.1 // indirect
go.opentelemetry.io/collector/semconv v0.108.1 // indirect
go.opentelemetry.io/collector/service v0.108.1 // indirect
go.opentelemetry.io/contrib/config v0.8.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
Expand All @@ -92,11 +99,11 @@ require (
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
gonum.org/v1/gonum v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
gonum.org/v1/gonum v0.15.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading
Loading