Skip to content

Commit

Permalink
Merge branch 'main' into change-logfile-undefined-severitytext
Browse files Browse the repository at this point in the history
  • Loading branch information
@bogdandrutu
bogdandrutu committed Sep 24, 2021
2 parents eb6b881 + 5870e74 commit d63cc73
Show file tree
Hide file tree
Showing 269 changed files with 1,470 additions and 1,273 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Move `k8sprocessor` to `k8sattributesprocessor`.
- Rename `k8s_tagger` configuration `k8sattributes`.
- filelog receiver: use empty value for `SeverityText` field instead of `"Undefined"` (#5423)
- Rename `configparser.ConfigMap` to `config.Map`

## v0.36.0

Expand Down
4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.mod
View file
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.36.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210922072157-086d5f473ab0
go.opentelemetry.io/collector/model v0.36.1-0.20210922072157-086d5f473ab0
go.opentelemetry.io/collector v0.36.1-0.20210923171211-10f543a9a43f
go.opentelemetry.io/collector/model v0.36.1-0.20210923171211-10f543a9a43f
go.uber.org/zap v1.19.1
)

Expand Down
16 changes: 9 additions & 7 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file

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

4 changes: 2 additions & 2 deletions exporter/awscloudwatchlogsexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.17
require (
github.com/aws/aws-sdk-go v1.40.47
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210922072157-086d5f473ab0
go.opentelemetry.io/collector/model v0.36.1-0.20210922072157-086d5f473ab0
go.opentelemetry.io/collector v0.36.1-0.20210923171211-10f543a9a43f
go.opentelemetry.io/collector/model v0.36.1-0.20210923171211-10f543a9a43f
go.uber.org/zap v1.19.1
)

Expand Down
16 changes: 9 additions & 7 deletions exporter/awscloudwatchlogsexporter/go.sum
View file

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

4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.36.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210922072157-086d5f473ab0
go.opentelemetry.io/collector/model v0.36.1-0.20210922072157-086d5f473ab0
go.opentelemetry.io/collector v0.36.1-0.20210923171211-10f543a9a43f
go.opentelemetry.io/collector/model v0.36.1-0.20210923171211-10f543a9a43f
go.uber.org/zap v1.19.1
google.golang.org/protobuf v1.27.1
)
Expand Down
16 changes: 9 additions & 7 deletions exporter/awsemfexporter/go.sum
View file

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

4 changes: 2 additions & 2 deletions exporter/awskinesisexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
github.com/golang/protobuf v1.5.2
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.36.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210922072157-086d5f473ab0
go.opentelemetry.io/collector/model v0.36.1-0.20210922072157-086d5f473ab0
go.opentelemetry.io/collector v0.36.1-0.20210923171211-10f543a9a43f
go.opentelemetry.io/collector/model v0.36.1-0.20210923171211-10f543a9a43f
go.uber.org/zap v1.19.1
google.golang.org/protobuf v1.27.1
)
Expand Down
16 changes: 9 additions & 7 deletions exporter/awskinesisexporter/go.sum
View file

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

7 changes: 3 additions & 4 deletions exporter/awsprometheusremotewriteexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/aws/aws-sdk-go v1.40.47
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.36.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.36.1-0.20210922072157-086d5f473ab0
go.opentelemetry.io/collector v0.36.1-0.20210923171211-10f543a9a43f
)

require (
Expand Down Expand Up @@ -34,9 +34,8 @@ require (
github.com/tidwall/tinylru v1.0.2 // indirect
github.com/tidwall/wal v0.1.5 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/model v0.36.1-0.20210922072157-086d5f473ab0 // indirect
go.opentelemetry.io/contrib v0.23.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.23.0 // indirect
go.opentelemetry.io/collector/model v0.36.1-0.20210923171211-10f543a9a43f // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 // indirect
go.opentelemetry.io/otel v1.0.0 // indirect
go.opentelemetry.io/otel/internal/metric v0.23.0 // indirect
go.opentelemetry.io/otel/metric v0.23.0 // indirect
Expand Down
Loading

0 comments on commit d63cc73

Please sign in to comment.