Skip to content

Fix otel-col dependency upgrade for targets that depend only on model #8100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2022
Merged

Fix otel-col dependency upgrade for targets that depend only on model #8100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Fix otel-col dependency upgrade for targets that depend only on model 
Signed-off-by: Bogdan Drutu <[email protected]>
  • Loading branch information
@bogdandrutu
bogdandrutu committed Feb 22, 2022
commit 42a21c8255ebe1b5f8e032760e3066cbba054251
10 changes: 5 additions & 5 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/multierr v1.7.0
golang.org/x/mod v0.5.1
)
Expand Down Expand Up @@ -54,7 +54,7 @@ require (
github.com/apache/thrift v0.16.0 // indirect
github.com/armon/go-metrics v0.3.10 // indirect
github.com/avast/retry-go v3.0.0+incompatible // indirect
github.com/aws/aws-sdk-go v1.43.2 // indirect
github.com/aws/aws-sdk-go v1.43.4 // indirect
github.com/beeker1121/goque v2.1.0+incompatible // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.2.0 // indirect
Expand Down Expand Up @@ -173,7 +173,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/compress v1.14.2 // indirect
github.com/klauspost/compress v1.14.4 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect
github.com/leoluk/perflib_exporter v0.1.0 // indirect
Expand Down Expand Up @@ -423,7 +423,7 @@ require (
go.etcd.io/bbolt v1.3.6 // indirect
go.mongodb.org/atlas v0.15.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
go.opentelemetry.io/otel v1.4.1 // indirect
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
Expand Down
21 changes: 11 additions & 10 deletions cmd/configschema/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions cmd/mdatagen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/go-playground/universal-translator v0.18.0
github.com/go-playground/validator/v10 v10.10.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
)

require (
Expand Down
8 changes: 4 additions & 4 deletions cmd/mdatagen/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/zap v1.21.0
)

Expand Down
16 changes: 8 additions & 8 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions exporter/awscloudwatchlogsexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsclo
go 1.17

require (
github.com/aws/aws-sdk-go v1.43.2
github.com/aws/aws-sdk-go v1.43.4
github.com/google/uuid v1.3.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/zap v1.21.0
)

Expand Down
20 changes: 10 additions & 10 deletions exporter/awscloudwatchlogsexporter/go.sum
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemf
go 1.17

require (
github.com/aws/aws-sdk-go v1.43.2
github.com/aws/aws-sdk-go v1.43.4
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/golang/protobuf v1.5.2
github.com/google/uuid v1.3.0
Expand All @@ -13,8 +13,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df
go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d
go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a
go.uber.org/zap v1.21.0
google.golang.org/protobuf v1.27.1
)
Expand Down
Loading