Skip to content

Commit 125c4af

Browse files
wpesserswpessers
committed
fix collector packages version conflicts
1 parent 7a08d38 commit 125c4af

4 files changed

Lines changed: 124 additions & 132 deletions

File tree

‎collector/go.mod‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.48.0
3434
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.48.0
3535
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.48.0
36-
go.opentelemetry.io/collector/otelcol v0.138.0
36+
go.opentelemetry.io/collector/otelcol v0.142.0
3737
go.uber.org/multierr v1.11.0
3838
go.uber.org/zap v1.27.1
3939
)
@@ -76,7 +76,7 @@ require (
7676
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7777
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7878
github.com/dennwc/varint v1.0.0 // indirect
79-
github.com/ebitengine/purego v0.9.0 // indirect
79+
github.com/ebitengine/purego v0.9.1 // indirect
8080
github.com/elastic/go-grok v0.3.1 // indirect
8181
github.com/elastic/lunes v0.2.0 // indirect
8282
github.com/expr-lang/expr v1.17.7 // indirect
@@ -158,17 +158,17 @@ require (
158158
github.com/prometheus/prometheus v0.308.0 // indirect
159159
github.com/prometheus/sigv4 v0.3.0 // indirect
160160
github.com/rs/cors v1.11.1 // indirect
161-
github.com/shirou/gopsutil/v4 v4.25.9 // indirect
162-
github.com/spf13/cobra v1.10.1 // indirect
161+
github.com/shirou/gopsutil/v4 v4.25.11 // indirect
162+
github.com/spf13/cobra v1.10.2 // indirect
163163
github.com/spf13/pflag v1.0.9 // indirect
164164
github.com/tg123/go-htpasswd v1.2.4 // indirect
165165
github.com/tidwall/gjson v1.10.2 // indirect
166166
github.com/tidwall/match v1.1.1 // indirect
167167
github.com/tidwall/pretty v1.2.0 // indirect
168168
github.com/tidwall/tinylru v1.1.0 // indirect
169169
github.com/tidwall/wal v1.2.1 // indirect
170-
github.com/tklauser/go-sysconf v0.3.15 // indirect
171-
github.com/tklauser/numcpus v0.10.0 // indirect
170+
github.com/tklauser/go-sysconf v0.3.16 // indirect
171+
github.com/tklauser/numcpus v0.11.0 // indirect
172172
github.com/twmb/murmur3 v1.1.8 // indirect
173173
github.com/ua-parser/uap-go v0.0.0-20240611065828-3a4781585db6 // indirect
174174
github.com/yusufpapurcu/wmi v1.2.4 // indirect
@@ -191,8 +191,8 @@ require (
191191
go.opentelemetry.io/collector/config/configtls v1.48.0 // indirect
192192
go.opentelemetry.io/collector/confmap/xconfmap v0.142.0 // indirect
193193
go.opentelemetry.io/collector/connector v0.142.0 // indirect
194-
go.opentelemetry.io/collector/connector/connectortest v0.138.0 // indirect
195-
go.opentelemetry.io/collector/connector/xconnector v0.138.0 // indirect
194+
go.opentelemetry.io/collector/connector/connectortest v0.142.0 // indirect
195+
go.opentelemetry.io/collector/connector/xconnector v0.142.0 // indirect
196196
go.opentelemetry.io/collector/consumer v1.48.0 // indirect
197197
go.opentelemetry.io/collector/consumer/consumererror v0.142.0 // indirect
198198
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.142.0 // indirect
@@ -208,15 +208,15 @@ require (
208208
go.opentelemetry.io/collector/exporter/xexporter v0.142.0 // indirect
209209
go.opentelemetry.io/collector/extension v1.48.0 // indirect
210210
go.opentelemetry.io/collector/extension/extensionauth v1.48.0 // indirect
211-
go.opentelemetry.io/collector/extension/extensioncapabilities v0.138.0 // indirect
211+
go.opentelemetry.io/collector/extension/extensioncapabilities v0.142.0 // indirect
212212
go.opentelemetry.io/collector/extension/extensionmiddleware v0.142.0 // indirect
213213
go.opentelemetry.io/collector/extension/extensiontest v0.142.0 // indirect
214214
go.opentelemetry.io/collector/extension/xextension v0.142.0 // indirect
215215
go.opentelemetry.io/collector/featuregate v1.48.0 // indirect
216216
go.opentelemetry.io/collector/internal/fanoutconsumer v0.142.0 // indirect
217-
go.opentelemetry.io/collector/internal/memorylimiter v0.138.0 // indirect
218-
go.opentelemetry.io/collector/internal/sharedcomponent v0.138.0 // indirect
219-
go.opentelemetry.io/collector/internal/telemetry v0.138.0 // indirect
217+
go.opentelemetry.io/collector/internal/memorylimiter v0.142.0 // indirect
218+
go.opentelemetry.io/collector/internal/sharedcomponent v0.142.0 // indirect
219+
go.opentelemetry.io/collector/internal/telemetry v0.142.0 // indirect
220220
go.opentelemetry.io/collector/pdata v1.48.0 // indirect
221221
go.opentelemetry.io/collector/pdata/pprofile v0.142.0 // indirect
222222
go.opentelemetry.io/collector/pdata/testdata v0.142.0 // indirect
@@ -225,24 +225,22 @@ require (
225225
go.opentelemetry.io/collector/pipeline/xpipeline v0.142.0 // indirect
226226
go.opentelemetry.io/collector/processor v1.48.0 // indirect
227227
go.opentelemetry.io/collector/processor/batchprocessor v0.142.0 // indirect
228-
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.138.0 // indirect
228+
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.142.0 // indirect
229229
go.opentelemetry.io/collector/processor/processorhelper v0.142.0 // indirect
230230
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.142.0 // indirect
231231
go.opentelemetry.io/collector/processor/processortest v0.142.0 // indirect
232232
go.opentelemetry.io/collector/processor/xprocessor v0.142.0 // indirect
233233
go.opentelemetry.io/collector/receiver v1.48.0 // indirect
234-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.138.0 // indirect
235-
go.opentelemetry.io/collector/receiver/receiverhelper v0.138.0 // indirect
234+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.142.0 // indirect
235+
go.opentelemetry.io/collector/receiver/receiverhelper v0.142.0 // indirect
236236
go.opentelemetry.io/collector/receiver/receivertest v0.142.0 // indirect
237237
go.opentelemetry.io/collector/receiver/xreceiver v0.142.0 // indirect
238238
go.opentelemetry.io/collector/semconv v0.128.0 // indirect
239-
go.opentelemetry.io/collector/service v0.138.0 // indirect
240-
go.opentelemetry.io/collector/service/hostcapabilities v0.138.0 // indirect
241-
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect
239+
go.opentelemetry.io/collector/service v0.142.0 // indirect
240+
go.opentelemetry.io/collector/service/hostcapabilities v0.142.0 // indirect
242241
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
243242
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
244243
go.opentelemetry.io/contrib/otelconf v0.18.0 // indirect
245-
go.opentelemetry.io/contrib/propagators/b3 v1.38.0 // indirect
246244
go.opentelemetry.io/otel v1.39.0 // indirect
247245
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect
248246
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 // indirect
@@ -255,7 +253,7 @@ require (
255253
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 // indirect
256254
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 // indirect
257255
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect
258-
go.opentelemetry.io/otel/log v0.14.0 // indirect
256+
go.opentelemetry.io/otel/log v0.15.0 // indirect
259257
go.opentelemetry.io/otel/metric v1.39.0 // indirect
260258
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
261259
go.opentelemetry.io/otel/sdk/log v0.14.0 // indirect

0 commit comments

Comments
 (0)