Skip to content

Commit 6f2d3b1

Browse files
frzifuscodeboten
andauthored
[internal/rabbitmq] move connection and retry logic into separate pkg (#34361)
This PR moves the retry logic from amqp publisher to amqp connection. Connection, client and other utility structures have been moved from `exporter/rabbitmqexporter/internal/publisher` to `internal/rabbitmq`. **Link to tracking Issue:** #34242 ---- cc @swar8080 @atoulme --------- Signed-off-by: Benedikt Bongartz <[email protected]> Co-authored-by: Alex Boten <[email protected]>
1 parent a5096f1 commit 6f2d3b1

File tree

20 files changed

+524
-242
lines changed

20 files changed

+524
-242
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ internal/kubelet/ @open-teleme
137137
internal/metadataproviders/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
138138
internal/otelarrow/ @open-telemetry/collector-contrib-approvers @jmacd @moh-osman3
139139
internal/pdatautil/ @open-telemetry/collector-contrib-approvers @djaglowski
140+
internal/rabbitmq/ @open-telemetry/collector-contrib-approvers @swar8080 @atoulme
140141
internal/sharedcomponent/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
141142
internal/splunk/ @open-telemetry/collector-contrib-approvers @dmitryax
142143
internal/sqlquery/ @open-telemetry/collector-contrib-approvers @crobert-1 @dmitryax

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ body:
134134
- internal/metadataproviders
135135
- internal/otelarrow
136136
- internal/pdatautil
137+
- internal/rabbitmq
137138
- internal/sharedcomponent
138139
- internal/splunk
139140
- internal/sqlquery

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ body:
128128
- internal/metadataproviders
129129
- internal/otelarrow
130130
- internal/pdatautil
131+
- internal/rabbitmq
131132
- internal/sharedcomponent
132133
- internal/splunk
133134
- internal/sqlquery

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ body:
128128
- internal/metadataproviders
129129
- internal/otelarrow
130130
- internal/pdatautil
131+
- internal/rabbitmq
131132
- internal/sharedcomponent
132133
- internal/splunk
133134
- internal/sqlquery

.github/ISSUE_TEMPLATE/unmaintained.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ body:
133133
- internal/metadataproviders
134134
- internal/otelarrow
135135
- internal/pdatautil
136+
- internal/rabbitmq
136137
- internal/sharedcomponent
137138
- internal/splunk
138139
- internal/sqlquery

cmd/otelcontribcol/builder-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ replaces:
355355
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ../../internal/k8sconfig
356356
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest
357357
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka
358+
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq => ../../internal/rabbitmq
358359
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver => ../../receiver/carbonreceiver
359360
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter => ../../exporter/splunkhecexporter
360361
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter => ../../exporter/prometheusexporter

cmd/otelcontribcol/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,7 @@ require (
640640
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.107.0 // indirect
641641
github.com/open-telemetry/opentelemetry-collector-contrib/internal/otelarrow v0.107.0 // indirect
642642
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.107.0 // indirect
643+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq v0.107.0 // indirect
643644
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.107.0 // indirect
644645
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.107.0 // indirect
645646
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery v0.107.0 // indirect
@@ -1073,6 +1074,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8ste
10731074

10741075
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka => ../../internal/kafka
10751076

1077+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq => ../../internal/rabbitmq
1078+
10761079
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver => ../../receiver/carbonreceiver
10771080

10781081
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter => ../../exporter/splunkhecexporter

exporter/rabbitmqexporter/factory.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616

1717
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/rabbitmqexporter/internal/metadata"
1818
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/rabbitmqexporter/internal/publisher"
19+
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq"
1920
)
2021

2122
const (
@@ -133,7 +134,7 @@ func getRoutingKeyOrDefault(config *Config, fallback string) string {
133134

134135
func newPublisherFactory(set exporter.Settings) publisherFactory {
135136
return func(dialConfig publisher.DialConfig) (publisher.Publisher, error) {
136-
return publisher.NewConnection(set.Logger, publisher.NewAmqpClient(), dialConfig)
137+
return publisher.NewConnection(set.Logger, rabbitmq.NewAmqpClient(set.Logger), dialConfig)
137138
}
138139
}
139140

exporter/rabbitmqexporter/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.22.0
44

55
require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.107.0
7+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq v0.107.0
78
github.com/rabbitmq/amqp091-go v1.10.0
89
github.com/stretchr/testify v1.9.0
910
github.com/testcontainers/testcontainers-go v0.31.0
@@ -110,6 +111,8 @@ require (
110111

111112
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
112113

114+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq => ../../internal/rabbitmq
115+
113116
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
114117

115118
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest

exporter/rabbitmqexporter/internal/publisher/client.go

Lines changed: 0 additions & 110 deletions
This file was deleted.

0 commit comments

Comments
 (0)