Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@ycombinator
ycombinator committed May 8, 2024
1 parent aec439e commit f8b1b92
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 162 deletions.
95 changes: 29 additions & 66 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,23 @@ require (
go.elastic.co/ecszap v1.0.1
go.elastic.co/go-licence-detector v0.5.0
go.opentelemetry.io/collector/component v0.98.0
go.opentelemetry.io/collector/confmap v0.98.0
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.96.0
go.opentelemetry.io/collector/confmap/provider/envprovider v0.96.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.96.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.96.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.96.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.96.0
go.opentelemetry.io/collector/confmap v0.99.0
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.97.0
go.opentelemetry.io/collector/confmap/provider/envprovider v0.97.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.97.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.97.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.97.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.97.0
go.opentelemetry.io/collector/exporter v0.98.0
go.opentelemetry.io/collector/exporter/debugexporter v0.96.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.96.0
go.opentelemetry.io/collector/featuregate v1.5.0
go.opentelemetry.io/collector/otelcol v0.96.0
go.opentelemetry.io/collector/exporter/debugexporter v0.97.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.97.0
go.opentelemetry.io/collector/featuregate v1.6.0
go.opentelemetry.io/collector/otelcol v0.97.0
go.opentelemetry.io/collector/processor v0.98.0
go.opentelemetry.io/collector/processor/batchprocessor v0.96.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.0
go.opentelemetry.io/collector/processor/batchprocessor v0.97.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.97.0
go.opentelemetry.io/collector/receiver v0.98.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.97.0
go.uber.org/zap v1.27.0
golang.org/x/crypto v0.22.0
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8
Expand All @@ -106,40 +106,12 @@ require (
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
)

require (
<<<<<<< HEAD
=======
// open telemetry dependencies
// pinned to v0.97.0 due to issue with ports binding which causes our tests to fail
// Do NOT upgrade the version beyond 0.97.0 until https://github.com/open-telemetry/opentelemetry-collector/issues/10031 is fixed!
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.97.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.97.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.97.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.97.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.97.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.97.0
go.opentelemetry.io/collector/component v0.97.0
go.opentelemetry.io/collector/confmap v0.99.0
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.97.0
go.opentelemetry.io/collector/confmap/provider/envprovider v0.97.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.97.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.97.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.97.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.97.0
go.opentelemetry.io/collector/exporter v0.97.0
go.opentelemetry.io/collector/exporter/debugexporter v0.97.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.97.0
go.opentelemetry.io/collector/featuregate v1.6.0
go.opentelemetry.io/collector/otelcol v0.97.0
go.opentelemetry.io/collector/processor v0.97.0
go.opentelemetry.io/collector/processor/batchprocessor v0.97.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.97.0
go.opentelemetry.io/collector/receiver v0.97.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.97.0
)
// open telemetry dependencies
// pinned to v0.97.0 due to issue with ports binding which causes our tests to fail
// Do NOT upgrade the version beyond 0.97.0 until https://github.com/open-telemetry/opentelemetry-collector/issues/10031 is fixed!
require github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.97.0

require (
>>>>>>> a045482d51 (Make `elasticsearchexporter` available in Agent running in OTel mode (#4707))
github.com/Jeffail/gabs/v2 v2.6.0 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/akavel/rsrc v0.8.0 // indirect
Expand Down Expand Up @@ -215,22 +187,13 @@ require (
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo/v2 v2.9.0 // indirect
<<<<<<< HEAD
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.98.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.98.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.98.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.98.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.98.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.98.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.98.0 // indirect
=======
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.97.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.97.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.97.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.97.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.97.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.97.0 // indirect
>>>>>>> a045482d51 (Make `elasticsearchexporter` available in Agent running in OTel mode (#4707))
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
Expand All @@ -257,25 +220,25 @@ require (
go.elastic.co/fastjson v1.1.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.98.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.96.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.96.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.96.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.96.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.96.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.97.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.4.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.97.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.97.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.97.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.5.0 // indirect
go.opentelemetry.io/collector/config/configretry v0.98.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.98.0 // indirect
go.opentelemetry.io/collector/config/internal v0.96.0 // indirect
go.opentelemetry.io/collector/connector v0.96.0 // indirect
go.opentelemetry.io/collector/config/internal v0.97.0 // indirect
go.opentelemetry.io/collector/connector v0.97.0 // indirect
go.opentelemetry.io/collector/consumer v0.98.0 // indirect
go.opentelemetry.io/collector/extension v0.98.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.96.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.97.0 // indirect
go.opentelemetry.io/collector/pdata v1.5.0 // indirect
go.opentelemetry.io/collector/semconv v0.98.0 // indirect
go.opentelemetry.io/collector/service v0.96.0 // indirect
go.opentelemetry.io/collector/service v0.97.0 // indirect
go.opentelemetry.io/contrib/config v0.4.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect
go.opentelemetry.io/otel v1.25.0 // indirect
Expand Down
Loading

0 comments on commit f8b1b92

Please sign in to comment.