Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ycombinator committed May 8, 2024
1 parent 5cb6c62 commit 1df51cf
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 36 deletions.
12 changes: 6 additions & 6 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9452,11 +9452,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/conf

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/exporter
Version: v0.97.0
Version: v0.98.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/exporter@v0.97.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/exporter@v0.98.0/LICENSE:


Apache License
Expand Down Expand Up @@ -10512,11 +10512,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/otel

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/processor
Version: v0.97.0
Version: v0.98.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/processor@v0.97.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/processor@v0.98.0/LICENSE:


Apache License
Expand Down Expand Up @@ -30527,11 +30527,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/conf

--------------------------------------------------------------------------------
Dependency : go.opentelemetry.io/collector/config/configretry
Version: v0.97.0
Version: v0.98.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/config/configretry@v0.97.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/config/configretry@v0.98.0/LICENSE:


Apache License
Expand Down
38 changes: 19 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,24 @@ require (
go.elastic.co/apm/module/apmgorilla v1.15.0
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.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.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.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.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 Down Expand Up @@ -91,24 +109,6 @@ require (
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.98.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.98.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.97.0
)

require (
Expand Down Expand Up @@ -226,7 +226,7 @@ require (
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.97.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.97.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1960,8 +1960,8 @@ go.opentelemetry.io/collector/config/confignet v0.97.0 h1:KJjv10/YVMslSSLVWW/IIj
go.opentelemetry.io/collector/config/confignet v0.97.0/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k=
go.opentelemetry.io/collector/config/configopaque v1.5.0 h1:WJzgmsFU2v63BypPBNGL31ACwWn6PwumPJNpLZplcdE=
go.opentelemetry.io/collector/config/configopaque v1.5.0/go.mod h1:/otnfj2E8r5EfaAdNV4qHkTclmiBCZXaahV5EcLwT7k=
go.opentelemetry.io/collector/config/configretry v0.97.0 h1:k7VwQ5H0oBLm6Fgm0ltfDDbmQVsiqSIY9ojijF0hiR0=
go.opentelemetry.io/collector/config/configretry v0.97.0/go.mod h1:s7A6ZGxK8bxqidFzwbr2pITzbsB2qf+aeHEDQDcanV8=
go.opentelemetry.io/collector/config/configretry v0.98.0 h1:gZRenX9oMLJmQ/CD8YwFNl9YYl68RtcD0RYSCJhrMAk=
go.opentelemetry.io/collector/config/configretry v0.98.0/go.mod h1:uRdmPeCkrW9Zsadh2WEbQ1AGXGYJ02vCfmmT+0g69nY=
go.opentelemetry.io/collector/config/configtelemetry v0.98.0 h1:f8RNZ1l/kYPPoxFmKKvTUli8iON7CMsm85KM38PVNts=
go.opentelemetry.io/collector/config/configtelemetry v0.98.0/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o=
go.opentelemetry.io/collector/config/configtls v0.98.0 h1:g+MADy01ge8iGC6v2tbJ5G27CWNG1BaJtmYdmpvm8e4=
Expand All @@ -1986,8 +1986,8 @@ go.opentelemetry.io/collector/connector v0.97.0 h1:X3AI3rCRiNhKCF5OJc1XzNoIKYbCl
go.opentelemetry.io/collector/connector v0.97.0/go.mod h1:KolkR5/kkPzy2jW7Q7zs+FiO1xiDrBeAvDYrZe/ygtA=
go.opentelemetry.io/collector/consumer v0.98.0 h1:47zJ5HFKXVA0RciuwkZnPU5W8j0TYUxToB1/zzzgEhs=
go.opentelemetry.io/collector/consumer v0.98.0/go.mod h1:c2edTq38uVJET/NE6VV7/Qpyznnlz8b6VE7J6TXD57c=
go.opentelemetry.io/collector/exporter v0.97.0 h1:kw/fQrpkhTz0/3I/Z0maRj0S8Mi0NK50/WwFuWrRYPc=
go.opentelemetry.io/collector/exporter v0.97.0/go.mod h1:EJYc4biKWxq3kD4Xh4SUSFbZ2lMsxjzwiCozikEDMjk=
go.opentelemetry.io/collector/exporter v0.98.0 h1:eN2qtkiwpeX9gBu9JZw1k/CZ3N9wZE1aGJ1A0EvwJ7w=
go.opentelemetry.io/collector/exporter v0.98.0/go.mod h1:GCW46a0VAuW7nljlW//GgFXI+8mSrJjrdEKVO9icExE=
go.opentelemetry.io/collector/exporter/debugexporter v0.97.0 h1:BZ2QjBmPBsYKFKaZvOJU0o0Xfth8kxOB6izrCB19qTM=
go.opentelemetry.io/collector/exporter/debugexporter v0.97.0/go.mod h1:CKrzODDvR5bLQZxSkNXUoaFcCY1fe6dPZV6FkdyH8/M=
go.opentelemetry.io/collector/exporter/otlpexporter v0.97.0 h1:yqEl3oMw/h4jzkTEC599Icm2jp7oVsa1pOu5RoxIJTA=
Expand All @@ -2006,8 +2006,8 @@ go.opentelemetry.io/collector/pdata v1.5.0 h1:1fKTmUpr0xCOhP/B0VEvtz7bYPQ45luQ8X
go.opentelemetry.io/collector/pdata v1.5.0/go.mod h1:TYj8aKRWZyT/KuKQXKyqSEvK/GV+slFaDMEI+Ke64Yw=
go.opentelemetry.io/collector/pdata/testdata v0.98.0 h1:8gohV+LFXqMzuDwfOOQy9GcZBOX0C9xGoQkoeXFTzmI=
go.opentelemetry.io/collector/pdata/testdata v0.98.0/go.mod h1:B/IaHcf6+RtxI292CZu9TjfYQdi1n4+v6b8rHEonpKs=
go.opentelemetry.io/collector/processor v0.97.0 h1:L3R5R7x56LH2inF3sv0ZOsFfulVo8yuIFhO/OgpkCU0=
go.opentelemetry.io/collector/processor v0.97.0/go.mod h1:OsxBAPQ2fDytAn+yWLdEQ1yjYfl/OIak1AfKGfI8ALs=
go.opentelemetry.io/collector/processor v0.98.0 h1:onrg8a99lToytbHF148Bg9a7DfNk31B+p6UHouiiVTw=
go.opentelemetry.io/collector/processor v0.98.0/go.mod h1:QxgzjmJI12DQWN0LIHmZBOR7HRzPuVWFW4oqTdrS1ho=
go.opentelemetry.io/collector/processor/batchprocessor v0.97.0 h1:DpC+d8ZQB/Qj5+sODYPpu8a8l0aMtMZEq6pN/3e+5X4=
go.opentelemetry.io/collector/processor/batchprocessor v0.97.0/go.mod h1:2sSDgffCKAUocMEapmcMBvgfBIotLtDFg/YJrOia8GE=
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.97.0 h1:B0ji9gIYZc+NohgcQ8arPtPLvzk+O1gdphGTk69hAmg=
Expand Down
10 changes: 5 additions & 5 deletions internal/pkg/otel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
| filelogreceiver | v0.97.0|
| otlpreceiver | v0.97.0|
| filelogreceiver | v0.97.0|



Expand All @@ -41,10 +41,10 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
| elasticsearchexporter | v0.97.0|
| fileexporter | v0.97.0|
| debugexporter | v0.97.0|
| otlpexporter | v0.97.0|
| elasticsearchexporter | v0.97.0|
| fileexporter | v0.97.0|



Expand All @@ -53,11 +53,11 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
| batchprocessor | v0.97.0|
| memorylimiterprocessor | v0.97.0|
| attributesprocessor | v0.97.0|
| resourceprocessor | v0.97.0|
| transformprocessor | v0.97.0|
| batchprocessor | v0.97.0|
| memorylimiterprocessor | v0.97.0|



0 comments on commit 1df51cf

Please sign in to comment.