Skip to content

Commit

Permalink
Update modules to v1.66.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrsillydog
mrsillydog committed Nov 21, 2024
1 parent fa45d1a commit b6b344e
Show file tree
Hide file tree
Showing 18 changed files with 63 additions and 73 deletions.
2 changes: 1 addition & 1 deletion cmd/plugindocgen/go.mod
View file
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.22.7

require (
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.65.0
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.66.0
github.com/spf13/pflag v1.0.5
gopkg.in/yaml.v3 v3.0.1
)
Expand Down
26 changes: 8 additions & 18 deletions docs/development.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ The steps are as follows:
./scripts/update-otel.sh {COLLECTOR_VERSION} {CONTRIB_VERSION} {PDATA_VERSION}
```
Grab the different versions from OTEL's GitHub by checking the latest release versions of [collector-contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib) and the [collector](https://github.com/open-telemetry/opentelemetry-collector). They should be the same.
The pdata version can be found by checking which version of it is imported in the collector-contrib [go.mod file](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/go.mod). The specific line with the pdata version should look similar to
```
go.opentelemetry.io/collector/pdata v1.0.0 // indirect
The pdata version can be found by checking the latest release notes of the collector in a header with {PDATA_VERSION}/{COLLECTOR_VERSION}. All three version arguments should include the v - an example run of the script would look like this:
```sh
./scripts/update-otel.sh v0.114.0 v0.114.0 v1.20.0
```
2. Run `make tidy`
Expand All @@ -46,25 +46,15 @@ The steps are as follows:
```
These should be the same versions used in the first step.
4. Update the `mdatagen` package in the `install-tools` command in the Makefile to now point to the same version as collector-contrib.
Specifically, this line is the one to update:
```
.PHONY: install-tools
install-tools:
...
go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/[email protected]
```
5. Run `make install-tools`
4. Run `make install-tools`
6. Run `make generate`
5. Run `make generate`
7. Run `make tidy`
6. Run `make tidy`
8. Run `make ci-checks`
7. Run `make ci-checks`
If all was successful, the repo has had it's OTEL dependencies updated to the latest version.
If all was successful, the repo has had its OTEL dependencies updated to the latest version.
There is potential for tests to fail, deprecation issues, code changes, or a variety of other problems to arise, but once the above steps are successful the repo can be updated.
Expand Down
2 changes: 1 addition & 1 deletion exporter/chronicleexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.7
require (
github.com/golang/mock v1.6.0
github.com/google/uuid v1.6.0
github.com/observiq/bindplane-agent/expr v1.65.0
github.com/observiq/bindplane-agent/expr v1.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0
github.com/shirou/gopsutil/v3 v3.24.5
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/chronicleforwarderexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter
go 1.22.7

require (
github.com/observiq/bindplane-agent/expr v1.65.0
github.com/observiq/bindplane-agent/expr v1.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.114.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/qradar/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/exporter/qradar
go 1.22.7

require (
github.com/observiq/bindplane-agent/expr v1.65.0
github.com/observiq/bindplane-agent/expr v1.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.114.0
Expand Down
2 changes: 1 addition & 1 deletion extension/bindplaneextension/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.7

require (
github.com/golang/snappy v0.0.4
github.com/observiq/bindplane-agent/internal/measurements v1.65.0
github.com/observiq/bindplane-agent/internal/measurements v1.66.0
github.com/open-telemetry/opamp-go v0.17.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.114.0
github.com/stretchr/testify v1.9.0
Expand Down
64 changes: 32 additions & 32 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@ go 1.22.7

require (
github.com/google/uuid v1.6.0
github.com/observiq/bindplane-agent/exporter/azureblobexporter v1.65.0
github.com/observiq/bindplane-agent/exporter/chronicleexporter v1.65.0
github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter v1.65.0
github.com/observiq/bindplane-agent/exporter/googlecloudexporter v1.65.0
github.com/observiq/bindplane-agent/exporter/googlemanagedprometheusexporter v1.65.0
github.com/observiq/bindplane-agent/exporter/qradar v1.65.0
github.com/observiq/bindplane-agent/exporter/snowflakeexporter v1.65.0
github.com/observiq/bindplane-agent/internal/measurements v1.65.0
github.com/observiq/bindplane-agent/internal/report v1.65.0
github.com/observiq/bindplane-agent/packagestate v1.65.0
github.com/observiq/bindplane-agent/processor/datapointcountprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/logcountprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/lookupprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/maskprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/metricextractprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/metricstatsprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/removeemptyvaluesprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/resourceattributetransposerprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/samplingprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/spancountprocessor v1.65.0
github.com/observiq/bindplane-agent/processor/throughputmeasurementprocessor v1.65.0
github.com/observiq/bindplane-agent/receiver/awss3rehydrationreceiver v1.65.0
github.com/observiq/bindplane-agent/receiver/azureblobrehydrationreceiver v1.65.0
github.com/observiq/bindplane-agent/receiver/httpreceiver v1.65.0
github.com/observiq/bindplane-agent/receiver/m365receiver v1.65.0
github.com/observiq/bindplane-agent/receiver/oktareceiver v1.65.0
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.65.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.65.0
github.com/observiq/bindplane-agent/receiver/sapnetweaverreceiver v1.65.0
github.com/observiq/bindplane-agent/receiver/telemetrygeneratorreceiver v1.65.0
github.com/observiq/bindplane-agent/exporter/azureblobexporter v1.66.0
github.com/observiq/bindplane-agent/exporter/chronicleexporter v1.66.0
github.com/observiq/bindplane-agent/exporter/chronicleforwarderexporter v1.66.0
github.com/observiq/bindplane-agent/exporter/googlecloudexporter v1.66.0
github.com/observiq/bindplane-agent/exporter/googlemanagedprometheusexporter v1.66.0
github.com/observiq/bindplane-agent/exporter/qradar v1.66.0
github.com/observiq/bindplane-agent/exporter/snowflakeexporter v1.66.0
github.com/observiq/bindplane-agent/internal/measurements v1.66.0
github.com/observiq/bindplane-agent/internal/report v1.66.0
github.com/observiq/bindplane-agent/packagestate v1.66.0
github.com/observiq/bindplane-agent/processor/datapointcountprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/logcountprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/lookupprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/maskprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/metricextractprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/metricstatsprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/removeemptyvaluesprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/resourceattributetransposerprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/samplingprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/spancountprocessor v1.66.0
github.com/observiq/bindplane-agent/processor/throughputmeasurementprocessor v1.66.0
github.com/observiq/bindplane-agent/receiver/awss3rehydrationreceiver v1.66.0
github.com/observiq/bindplane-agent/receiver/azureblobrehydrationreceiver v1.66.0
github.com/observiq/bindplane-agent/receiver/httpreceiver v1.66.0
github.com/observiq/bindplane-agent/receiver/m365receiver v1.66.0
github.com/observiq/bindplane-agent/receiver/oktareceiver v1.66.0
github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.66.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.66.0
github.com/observiq/bindplane-agent/receiver/sapnetweaverreceiver v1.66.0
github.com/observiq/bindplane-agent/receiver/telemetrygeneratorreceiver v1.66.0
github.com/oklog/ulid/v2 v2.1.0
github.com/open-telemetry/opamp-go v0.17.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.114.0
Expand Down Expand Up @@ -360,8 +360,8 @@ require (
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/observiq/bindplane-agent/counter v1.65.0 // indirect
github.com/observiq/bindplane-agent/expr v1.65.0 // indirect
github.com/observiq/bindplane-agent/counter v1.66.0 // indirect
github.com/observiq/bindplane-agent/expr v1.66.0 // indirect
github.com/observiq/bindplane-agent/internal/rehydration v1.62.0 // indirect
github.com/okta/okta-sdk-golang/v2 v2.20.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.114.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion internal/rehydration/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/internal/rehydration
go 1.22.7

require (
github.com/observiq/bindplane-agent/internal/testutils v1.65.0
github.com/observiq/bindplane-agent/internal/testutils v1.66.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.114.0
go.opentelemetry.io/collector/consumer v0.114.0
Expand Down
6 changes: 3 additions & 3 deletions processor/datapointcountprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/observiq/bindplane-agent/processor/datapointcountprocessor
go 1.22.7

require (
github.com/observiq/bindplane-agent/counter v1.65.0
github.com/observiq/bindplane-agent/expr v1.65.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.65.0
github.com/observiq/bindplane-agent/counter v1.66.0
github.com/observiq/bindplane-agent/expr v1.66.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.114.0
Expand Down
6 changes: 3 additions & 3 deletions processor/logcountprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/observiq/bindplane-agent/processor/logcountprocessor
go 1.22.7

require (
github.com/observiq/bindplane-agent/counter v1.65.0
github.com/observiq/bindplane-agent/expr v1.65.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.65.0
github.com/observiq/bindplane-agent/counter v1.66.0
github.com/observiq/bindplane-agent/expr v1.66.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.114.0
Expand Down
4 changes: 2 additions & 2 deletions processor/metricextractprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/observiq/bindplane-agent/processor/metricextractprocessor
go 1.22.7

require (
github.com/observiq/bindplane-agent/expr v1.65.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.65.0
github.com/observiq/bindplane-agent/expr v1.66.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.114.0
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion processor/samplingprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/processor/samplingprocessor
go 1.22.7

require (
github.com/observiq/bindplane-agent/expr v1.65.0
github.com/observiq/bindplane-agent/expr v1.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.114.0
Expand Down
2 changes: 1 addition & 1 deletion processor/snapshotprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/processor/snapshotprocessor
go 1.22.7

require (
github.com/observiq/bindplane-agent/internal/report v1.65.0
github.com/observiq/bindplane-agent/internal/report v1.66.0
github.com/open-telemetry/opamp-go v0.15.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.114.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.114.0
Expand Down
6 changes: 3 additions & 3 deletions processor/spancountprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/observiq/bindplane-agent/processor/spancountprocessor
go 1.22.7

require (
github.com/observiq/bindplane-agent/counter v1.65.0
github.com/observiq/bindplane-agent/expr v1.65.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.65.0
github.com/observiq/bindplane-agent/counter v1.66.0
github.com/observiq/bindplane-agent/expr v1.66.0
github.com/observiq/bindplane-agent/receiver/routereceiver v1.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.114.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.114.0
Expand Down
2 changes: 1 addition & 1 deletion processor/throughputmeasurementprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/observiq/bindplane-agent/processor/throughputmeasurementproces
go 1.22.7

require (
github.com/observiq/bindplane-agent/internal/measurements v1.65.0
github.com/observiq/bindplane-agent/internal/measurements v1.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.114.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.114.0
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion receiver/awss3rehydrationreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1
github.com/observiq/bindplane-agent/internal/rehydration v1.62.0
github.com/observiq/bindplane-agent/internal/testutils v1.65.0
github.com/observiq/bindplane-agent/internal/testutils v1.66.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.114.0
go.opentelemetry.io/collector/component/componenttest v0.114.0
Expand Down
2 changes: 1 addition & 1 deletion receiver/azureblobrehydrationreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.7
require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0
github.com/observiq/bindplane-agent/internal/rehydration v1.62.0
github.com/observiq/bindplane-agent/internal/testutils v1.65.0
github.com/observiq/bindplane-agent/internal/testutils v1.66.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.114.0
go.opentelemetry.io/collector/component/componenttest v0.114.0
Expand Down
2 changes: 1 addition & 1 deletion updater/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.7

require (
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/observiq/bindplane-agent/packagestate v1.65.0
github.com/observiq/bindplane-agent/packagestate v1.66.0
github.com/open-telemetry/opamp-go v0.9.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
Expand Down

0 comments on commit b6b344e

Please sign in to comment.