[internal/rabbitmq] move connection and retry logic into separate pkg #34361
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
cmd/otelcontribcol
frzifus
force-pushed
the
internal_rabbitmq
branch
4 times, most recently
from
cabf4a8
to
730f926
Compare
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
frzifus
force-pushed
the
internal_rabbitmq
branch
from
730f926
to
55d0786
Compare
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
swar8080
reviewed
Aug 1, 2024
| @@ -307,15 +316,20 @@ type mockConnection struct { | |||
| mock.Mock | |||
| } | |||
|
|
|||
| func (m *mockConnection) ReconnectIfUnhealthy() error { | |||
There was a problem hiding this comment.
looks like there's no longer unit test coverage for the actual implementation of this method? might be worth adding a unit test for it in the internal package
There was a problem hiding this comment.
Agree. I added a test in the internal/rabbitmq pkg.
| "time" | ||
|
|
||
| amqp "github.com/rabbitmq/amqp091-go" | ||
| "go.uber.org/zap" | ||
|
|
||
| "github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq" |
There was a problem hiding this comment.
maybe it's worth aliasing this import so its clearer when skimming the code that rabbitmq refers to an otel-contrib package and not the external rabbitmq client library
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
swar8080
approved these changes
Aug 1, 2024
swar8080
approved these changes
Aug 6, 2024
iblancasa
approved these changes
Aug 6, 2024
|
FTR: just resolved merge conflicts in the |
Resolve conflicts in go.mod Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
frzifus
force-pushed
the
internal_rabbitmq
branch
from
78cc97d
to
af259d8
Compare
codeboten
approved these changes
Aug 14, 2024
f7o
pushed a commit
to f7o/opentelemetry-collector-contrib
that referenced
this pull request
Sep 12, 2024
…open-telemetry#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:** open-telemetry#34242 ---- cc @swar8080 @atoulme --------- Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de> Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
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/publishertointernal/rabbitmq.Link to tracking Issue:
Testing:
Documentation:
cc @swar8080 @atoulme