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

Update go-amqp to 0.19.1 #20856

Merged
merged 7 commits into from
Apr 11, 2023
Merged

Update go-amqp to 0.19.1 #20856

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf5e925
Bump github.com/Azure/azure-event-hubs-go/v3
dependabot[bot] Apr 3, 2023
45bbd24
Bump github.com/Azure/azure-event-hubs-go/v3
dependabot[bot] Apr 3, 2023
7a494e5
Updated go-amqp to v0.19.1 in receiver/solacereceiver
mcardy Apr 4, 2023
49a8d80
Ran make gotidy
mcardy Apr 4, 2023
9b8542b
Merge branch 'main' into go_amqp_0_19_1
mcardy Apr 11, 2023
7fb6680
Added changelog for change from uint32 to int32
mcardy Apr 11, 2023
fe03708
Set change type to breaking in changelog
mcardy Apr 11, 2023
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
16 changes: 16 additions & 0 deletions .chloggen/solace-max-unacked-uint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type:
mcardy marked this conversation as resolved.
Show resolved Hide resolved

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: solacereceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Changed the type of the max_unacknowledged configuration option from uint32 to int32

# One or more tracking issues related to the change
issues: [20666]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
6 changes: 3 additions & 3 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ require (
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.1 // indirect
github.com/AthenZ/athenz v1.10.39 // indirect
github.com/Azure/azure-amqp-common-go/v4 v4.0.0 // indirect
github.com/Azure/azure-event-hubs-go/v3 v3.4.0 // indirect
github.com/Azure/azure-amqp-common-go/v4 v4.1.0 // indirect
github.com/Azure/azure-event-hubs-go/v3 v3.5.0 // indirect
github.com/Azure/azure-kusto-go v0.11.3 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v67.1.0+incompatible // indirect
Expand All @@ -230,7 +230,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 // indirect
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd // indirect
github.com/Azure/go-amqp v0.18.1 // indirect
github.com/Azure/go-amqp v0.19.1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
Expand Down
12 changes: 6 additions & 6 deletions cmd/configschema/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cmd/otelcontribcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ require (
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.1 // indirect
github.com/AthenZ/athenz v1.10.39 // indirect
github.com/Azure/azure-amqp-common-go/v4 v4.0.0 // indirect
github.com/Azure/azure-event-hubs-go/v3 v3.4.0 // indirect
github.com/Azure/azure-amqp-common-go/v4 v4.1.0 // indirect
github.com/Azure/azure-event-hubs-go/v3 v3.5.0 // indirect
github.com/Azure/azure-kusto-go v0.11.3 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v67.1.0+incompatible // indirect
Expand All @@ -215,7 +215,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 // indirect
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd // indirect
github.com/Azure/go-amqp v0.18.1 // indirect
github.com/Azure/go-amqp v0.19.1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
Expand Down
12 changes: 6 additions & 6 deletions cmd/otelcontribcol/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ require (
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
github.com/99designs/keyring v1.2.1 // indirect
github.com/AthenZ/athenz v1.10.39 // indirect
github.com/Azure/azure-amqp-common-go/v4 v4.0.0 // indirect
github.com/Azure/azure-event-hubs-go/v3 v3.4.0 // indirect
github.com/Azure/azure-amqp-common-go/v4 v4.1.0 // indirect
github.com/Azure/azure-event-hubs-go/v3 v3.5.0 // indirect
github.com/Azure/azure-kusto-go v0.11.3 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v67.1.0+incompatible // indirect
Expand All @@ -204,7 +204,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 // indirect
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd // indirect
github.com/Azure/go-amqp v0.18.1 // indirect
github.com/Azure/go-amqp v0.19.1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.22 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions receiver/azureblobreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureb
go 1.19

require (
github.com/Azure/azure-event-hubs-go/v3 v3.4.0
github.com/Azure/azure-event-hubs-go/v3 v3.5.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.75.0
github.com/stretchr/testify v1.8.2
Expand All @@ -17,11 +17,11 @@ require (

require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/Azure/azure-amqp-common-go/v4 v4.0.0 // indirect
github.com/Azure/azure-amqp-common-go/v4 v4.1.0 // indirect
github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.1 // indirect
github.com/Azure/go-amqp v0.18.0 // indirect
github.com/Azure/go-amqp v0.19.1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
Expand Down
12 changes: 6 additions & 6 deletions receiver/azureblobreceiver/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions receiver/azureeventhubreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuree
go 1.19

require (
github.com/Azure/azure-amqp-common-go/v4 v4.0.0
github.com/Azure/azure-event-hubs-go/v3 v3.4.0
github.com/Azure/azure-amqp-common-go/v4 v4.1.0
github.com/Azure/azure-event-hubs-go/v3 v3.5.0
github.com/json-iterator/go v1.1.12
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.75.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.75.0
Expand All @@ -23,7 +23,7 @@ require (
require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/Azure/azure-sdk-for-go v67.1.0+incompatible // indirect
github.com/Azure/go-amqp v0.18.1 // indirect
github.com/Azure/go-amqp v0.19.1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
Expand Down
12 changes: 6 additions & 6 deletions receiver/azureeventhubreceiver/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/solacereceiver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type Config struct {
Queue string `mapstructure:"queue"`

// The maximum number of unacknowledged messages the Solace broker can transmit, to configure AMQP Link
MaxUnacked uint32 `mapstructure:"max_unacknowledged"`
MaxUnacked int32 `mapstructure:"max_unacknowledged"`
mcardy marked this conversation as resolved.
Show resolved Hide resolved

TLS configtls.TLSClientSetting `mapstructure:"tls,omitempty"`

Expand Down
2 changes: 1 addition & 1 deletion receiver/solacereceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const (
stability = component.StabilityLevelDevelopment

// default value for max unaked messages
defaultMaxUnaked uint32 = 1000
defaultMaxUnaked int32 = 1000
// default value for host
defaultHost string = "localhost:5671"
)
Expand Down
2 changes: 1 addition & 1 deletion receiver/solacereceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solace
go 1.19

require (
github.com/Azure/go-amqp v0.18.1
github.com/Azure/go-amqp v0.19.1
github.com/stretchr/testify v1.8.2
go.opencensus.io v0.24.0
go.opentelemetry.io/collector v0.75.0
Expand Down
Loading