Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@jinja2
jinja2 committed Oct 11, 2023
1 parent 61aead5 commit 5916c0a
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 7 deletions.
25 changes: 18 additions & 7 deletions receiver/k8sobjectsreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobj
go 1.20

require (
github.com/google/uuid v1.3.1
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.87.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.87.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.87.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.87.0
go.opentelemetry.io/collector/confmap v0.87.0
go.opentelemetry.io/collector/consumer v0.87.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0016
go.opentelemetry.io/collector/receiver v0.87.0
go.opentelemetry.io/collector/semconv v0.87.0
github.com/google/uuid v1.3.1
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.87.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.87.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.87.0

go.opentelemetry.io/collector/semconv v0.87.0
go.uber.org/zap v1.26.0
k8s.io/apimachinery v0.28.2
k8s.io/client-go v0.28.2
Expand Down Expand Up @@ -59,7 +58,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/go-grpc-compression v1.2.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.1-0.20231006161201-d364ad61c4d7 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
github.com/openshift/api v3.9.0+incompatible // indirect
Expand All @@ -70,8 +69,20 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.87.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.87.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.87.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.87.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.87.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.87.0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.87.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.87.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.87.0 // indirect
go.opentelemetry.io/collector/config/internal v0.87.0 // indirect
go.opentelemetry.io/collector/extension v0.87.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.87.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0016 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
Expand Down
27 changes: 27 additions & 0 deletions receiver/k8sobjectsreceiver/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5916c0a

Please sign in to comment.