Skip to content
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

Jump to bottom

Bump otel collector to latest head #13738

Merged
merged 1 commit into from
Aug 30, 2022
Merged

Bump otel collector to latest head #13738

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
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib v0.58.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.58.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector v0.58.1-0.20220830152521-5772e58c2007
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
golang.org/x/text v0.3.7
)
Expand Down Expand Up @@ -535,8 +535,8 @@ require (
go.mongodb.org/atlas v0.16.0 // indirect
go.mongodb.org/mongo-driver v1.10.1 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/pdata v0.58.1-0.20220829231818-9ba35cd40b46 // indirect
go.opentelemetry.io/collector/semconv v0.58.1-0.20220829231818-9ba35cd40b46 // indirect
go.opentelemetry.io/collector/pdata v0.58.1-0.20220830152521-5772e58c2007 // indirect
go.opentelemetry.io/collector/semconv v0.58.1-0.20220830152521-5772e58c2007 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect
go.opentelemetry.io/contrib/zpages v0.34.0 // indirect
Expand Down
12 changes: 6 additions & 6 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.11.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector/pdata v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector v0.58.1-0.20220830152521-5772e58c2007
go.opentelemetry.io/collector/pdata v0.58.1-0.20220830152521-5772e58c2007
)

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.

6 changes: 3 additions & 3 deletions exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.58.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector/pdata v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector/semconv v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector v0.58.1-0.20220830152521-5772e58c2007
go.opentelemetry.io/collector/pdata v0.58.1-0.20220830152521-5772e58c2007
go.opentelemetry.io/collector/semconv v0.58.1-0.20220830152521-5772e58c2007
go.uber.org/zap v1.23.0
)

Expand Down
12 changes: 6 additions & 6 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.

2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func mapLogRecordToLogService(lr plog.LogRecord,

contentsBuffer = append(contentsBuffer, sls.LogContent{
Key: proto.String(slsLogFlags),
Value: proto.String(strconv.FormatUint(uint64(lr.FlagsStruct().AsRaw()), 16)),
Value: proto.String(strconv.FormatUint(uint64(lr.FlagsStruct()), 16)),
})

contentsBuffer = append(contentsBuffer, sls.LogContent{
Expand Down
2 changes: 1 addition & 1 deletion exporter/awscloudwatchlogsexporter/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func logToCWLog(resourceAttrs map[string]interface{}, log plog.LogRecord) (*clou
SeverityNumber: int32(log.SeverityNumber()),
SeverityText: log.SeverityText(),
DroppedAttributesCount: log.DroppedAttributesCount(),
Flags: log.FlagsStruct().AsRaw(),
Flags: uint32(log.FlagsStruct()),
}
if traceID := log.TraceID(); !traceID.IsEmpty() {
body.TraceID = traceID.HexString()
Expand Down
2 changes: 1 addition & 1 deletion exporter/awscloudwatchlogsexporter/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func testLogRecord() plog.LogRecord {
record.Attributes().UpsertString("key2", "attr2")
record.SetTraceID(pcommon.NewTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}))
record.SetSpanID(pcommon.NewSpanID([8]byte{1, 2, 3, 4, 5, 6, 7, 8}))
record.FlagsStruct().SetIsSampled(true)
record.SetFlagsStruct(plog.DefaultLogRecordFlags.WithIsSampled(true))
record.SetTimestamp(1609719139000000)
return record
}
Expand Down
4 changes: 2 additions & 2 deletions exporter/awscloudwatchlogsexporter/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/internal/aws/awsutil v0.58.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.58.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector/pdata v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector v0.58.1-0.20220830152521-5772e58c2007
go.opentelemetry.io/collector/pdata v0.58.1-0.20220830152521-5772e58c2007
go.uber.org/zap v1.23.0
)

Expand Down
8 changes: 4 additions & 4 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 @@ -13,9 +13,9 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.58.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector/pdata v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector/semconv v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector v0.58.1-0.20220830152521-5772e58c2007
go.opentelemetry.io/collector/pdata v0.58.1-0.20220830152521-5772e58c2007
go.opentelemetry.io/collector/semconv v0.58.1-0.20220830152521-5772e58c2007
go.uber.org/zap v1.23.0
google.golang.org/protobuf v1.28.1
)
Expand Down
12 changes: 6 additions & 6 deletions exporter/awsemfexporter/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/awskinesisexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.58.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.58.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector v0.58.1-0.20220830152521-5772e58c2007
go.uber.org/zap v1.23.0
)

require (
github.com/gogo/protobuf v1.3.2
github.com/google/uuid v1.3.0
github.com/jaegertracing/jaeger v1.37.0
go.opentelemetry.io/collector/pdata v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector/pdata v0.58.1-0.20220830152521-5772e58c2007
go.uber.org/multierr v1.8.0
)

Expand All @@ -40,7 +40,7 @@ require (
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/semconv v0.58.1-0.20220829231818-9ba35cd40b46 // indirect
go.opentelemetry.io/collector/semconv v0.58.1-0.20220830152521-5772e58c2007 // indirect
go.opentelemetry.io/otel v1.9.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/trace v1.9.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions exporter/awskinesisexporter/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/awsxrayexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.58.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.58.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector/pdata v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector/semconv v0.58.1-0.20220829231818-9ba35cd40b46
go.opentelemetry.io/collector v0.58.1-0.20220830152521-5772e58c2007
go.opentelemetry.io/collector/pdata v0.58.1-0.20220830152521-5772e58c2007
go.opentelemetry.io/collector/semconv v0.58.1-0.20220830152521-5772e58c2007
go.uber.org/zap v1.23.0
)

Expand Down
Loading