Skip to content

Commit

Permalink
chore: Merge release/v1.58.0 to main for release prep (#1806)
Browse files Browse the repository at this point in the history
  • Loading branch information
dpaasman00 authored Aug 20, 2024
2 parents ed0c695 + 7bb2c46 commit b33ba76
Show file tree
Hide file tree
Showing 127 changed files with 3,327 additions and 4,133 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/manual_msi_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
# either 'goreleaser' (default) or 'goreleaser-pro'
distribution: goreleaser-pro
version: "v1.22.1"
version: "v2.1.0"
args: build --single-target --skip=validate --clean --snapshot
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
uses: goreleaser/goreleaser-action@v5
with:
distribution: goreleaser-pro
version: "v1.22.1"
version: "v2.1.0"
args: release --clean --timeout 120m
env:
GITHUB_TOKEN: ${{ secrets.ORG_GORELEASER_GITHUB_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
version: 2

project_name: observiq-otel-collector

before:
Expand Down Expand Up @@ -631,7 +633,6 @@ release:

# https://goreleaser.com/customization/changelog/
changelog:
skip: false
use: github
sort: asc
groups:
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ install-tools:
cd $(TOOLS_MOD_DIR) && go install github.com/uw-labs/lichen
cd $(TOOLS_MOD_DIR) && go install github.com/vektra/mockery/v2
cd $(TOOLS_MOD_DIR) && go install golang.org/x/tools/cmd/goimports
cd $(TOOLS_MOD_DIR) && go install github.com/goreleaser/goreleaser

.PHONY: lint
lint:
Expand Down
14 changes: 14 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Security Policy

## Reporting a Vulnerability

If you find something suspicious and want to report it, we'd really appreciate!

### Ways to Report

In order for the vulnerability reports to reach maintainers as soon as possible, the preferred way is to use the
`Report a vulnerability button` on the `Security` tab in the respective GitHub repository. It creates a private
communication channel between the reporter and the maintainers.

If you are absolutely unable to or have strong reasons not to use GitHub reporting workflow, please send an email
to [email protected].
59 changes: 29 additions & 30 deletions cmd/plugindocgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/plugindocgen
go 1.21.9

require (
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.57.2
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.58.0
github.com/spf13/pflag v1.0.5
gopkg.in/yaml.v3 v3.0.1
)
Expand All @@ -19,7 +19,6 @@ require (
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // 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
Expand All @@ -34,45 +33,45 @@ 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.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.107.0 // 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_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.6 // 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/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.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.106.1 // indirect
go.opentelemetry.io/collector/component v0.106.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.106.1 // indirect
go.opentelemetry.io/collector/confmap v0.106.1 // indirect
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.106.1 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1 // indirect
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.106.1 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.106.1 // indirect
go.opentelemetry.io/collector/connector v0.106.1 // indirect
go.opentelemetry.io/collector/consumer v0.106.1 // indirect
go.opentelemetry.io/collector/exporter v0.106.1 // indirect
go.opentelemetry.io/collector/extension v0.106.1 // indirect
go.opentelemetry.io/collector/featuregate v1.12.0 // indirect
go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect
go.opentelemetry.io/collector/otelcol v0.106.1 // indirect
go.opentelemetry.io/collector/pdata v1.12.0 // indirect
go.opentelemetry.io/collector/processor v0.106.1 // indirect
go.opentelemetry.io/collector/receiver v0.106.1 // indirect
go.opentelemetry.io/collector/semconv v0.106.1 // indirect
go.opentelemetry.io/collector/service v0.106.1 // 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.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
go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
Expand All @@ -92,9 +91,9 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.23.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
Expand Down
Loading

0 comments on commit b33ba76

Please sign in to comment.