Skip to content

Commit 1e19b28

Browse files
vidam-iovidam-io
committed
kafkaexporter: solve conflict
1 parent 1518bca commit 1e19b28

File tree

10 files changed

+15
-0
lines changed

10 files changed

+15
-0
lines changed

‎exporter/kafkaexporter/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ require (
9090
github.com/xdg-go/scram v1.1.2 // indirect
9191
github.com/xdg-go/stringprep v1.0.4 // indirect
9292
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
93+
go.opentelemetry.io/collector/config/configcompression v1.31.0 // indirect
9394
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250505152726-56c7da210783 // indirect
9495
go.opentelemetry.io/collector/config/configtls v1.31.1-0.20250505152726-56c7da210783 // indirect
9596
go.opentelemetry.io/collector/consumer/consumertest v0.125.1-0.20250505155216-829157cef7bb // indirect

‎exporter/kafkaexporter/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extension/observer/kafkatopicsobserver/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ require (
6969
github.com/xdg-go/scram v1.1.2 // indirect
7070
github.com/xdg-go/stringprep v1.0.4 // indirect
7171
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
72+
go.opentelemetry.io/collector/config/configcompression v1.31.0 // indirect
7273
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250505152726-56c7da210783 // indirect
7374
go.opentelemetry.io/collector/config/configtls v1.31.1-0.20250505152726-56c7da210783 // indirect
7475
go.opentelemetry.io/collector/featuregate v1.31.1-0.20250505152726-56c7da210783 // indirect

‎extension/observer/kafkatopicsobserver/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/kafka/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ require (
1212
github.com/twmb/franz-go/pkg/kfake v0.0.0-20250320172111-35ab5e5f5327
1313
github.com/xdg-go/scram v1.1.2
1414
go.opentelemetry.io/collector/component v1.31.1-0.20250505152726-56c7da210783
15+
go.opentelemetry.io/collector/config/configcompression v1.31.0
1516
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250505152726-56c7da210783
1617
go.opentelemetry.io/collector/config/configtls v1.31.1-0.20250505152726-56c7da210783
1718
go.opentelemetry.io/collector/confmap v1.31.1-0.20250505152726-56c7da210783

‎internal/kafka/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎receiver/kafkametricsreceiver/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ require (
7878
github.com/xdg-go/scram v1.1.2 // indirect
7979
github.com/xdg-go/stringprep v1.0.4 // indirect
8080
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
81+
go.opentelemetry.io/collector/config/configcompression v1.31.0 // indirect
8182
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250505152726-56c7da210783 // indirect
8283
go.opentelemetry.io/collector/config/configtls v1.31.1-0.20250505152726-56c7da210783 // indirect
8384
go.opentelemetry.io/collector/consumer/consumererror v0.125.1-0.20250505155216-829157cef7bb // indirect

‎receiver/kafkametricsreceiver/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎receiver/kafkareceiver/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ require (
101101
github.com/xdg-go/scram v1.1.2 // indirect
102102
github.com/xdg-go/stringprep v1.0.4 // indirect
103103
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
104+
go.opentelemetry.io/collector/config/configcompression v1.31.0 // indirect
104105
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250505152726-56c7da210783 // indirect
105106
go.opentelemetry.io/collector/consumer/consumererror v0.125.1-0.20250505155216-829157cef7bb // indirect
106107
go.opentelemetry.io/collector/consumer/xconsumer v0.125.1-0.20250505155216-829157cef7bb // indirect

‎receiver/kafkareceiver/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)