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

[internal/rabbitmq] move connection and retry logic into separate pkg #34361

Merged
merged 12 commits into from
Aug 14, 2024
Merged

[internal/rabbitmq] move connection and retry logic into separate pkg #34361

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e7205ec
internal/rabbitmq: move client impl from exporter into extra pkg
frzifus Jul 31, 2024
883cb6b
internal/rabbitmq: move retry logic into connection
frzifus Jul 31, 2024
c6db583
exporter/rabbitmqexporter: adapt signature
frzifus Aug 1, 2024
6849f13
exporter/rabbitmqexporter: remove indirect calls
frzifus Aug 1, 2024
55d0786
internal/rabbitmq: add metadata / codeowners
frzifus Aug 1, 2024
ab45338
update issue templates
frzifus Aug 1, 2024
4bf851e
internal/rabbitmq: add unittests
frzifus Aug 1, 2024
8d1263e
exporter/rabbitmqexporter: adapt internal import handle
frzifus Aug 1, 2024
72e2db6
Merge branch 'main' into internal_rabbitmq
frzifus Aug 1, 2024
b3cae15
Merge branch 'main' into internal_rabbitmq
frzifus Aug 6, 2024
af259d8
Merge branch 'main' into internal_rabbitmq
frzifus Aug 13, 2024
908618a
Update internal/rabbitmq/go.mod
codeboten Aug 14, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'main' into internal_rabbitmq 
Resolve conflicts in go.mod

Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
  • Loading branch information
@frzifus
frzifus committed Aug 13, 2024
commit af259d85b29d0685dfa9216ec850a55d018a8374
86 changes: 43 additions & 43 deletions cmd/otelcontribcol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,49 +619,49 @@ require (
github.com/nginxinc/nginx-prometheus-exporter v0.11.0 // indirect
github.com/oklog/ulid/v2 v2.1.0 // indirect
github.com/open-telemetry/opamp-go v0.15.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/otelarrow v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.106.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampcustommessages v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/otelarrow v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.107.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.107.0 // indirect
github.com/open-telemetry/otel-arrow v0.24.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/rabbitmqexporter/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/exporter/rabbit
go 1.21.0

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.106.1
github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq v0.106.1
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.107.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/rabbitmq v0.107.0
github.com/rabbitmq/amqp091-go v1.10.0
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go v0.31.0
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.