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

make update-otel #7520

Merged
merged 4 commits into from
Feb 2, 2022
Merged

make update-otel #7520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71cbddc
make update-otel
Feb 1, 2022
e5ef052
Logs() -> LogRecords()
Feb 1, 2022
ab8fcb3
NewDefaultConfigProvider -> MustNewDefaultConfigProvider
Feb 1, 2022
c1e3591
labels -> attributes
Feb 2, 2022
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
  •  
  •  
  •  
4 changes: 2 additions & 2 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.43.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.43.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.43.1
go.opentelemetry.io/collector/model v0.43.1
go.opentelemetry.io/collector v0.43.3-0.20220201020338-caead4c4b0e2
go.opentelemetry.io/collector/model v0.43.3-0.20220201020338-caead4c4b0e2
go.uber.org/multierr v1.7.0
golang.org/x/mod v0.5.1
)
Expand Down
10 changes: 4 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.10.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.43.1
go.opentelemetry.io/collector/model v0.43.1
go.opentelemetry.io/collector v0.43.3-0.20220201020338-caead4c4b0e2
go.opentelemetry.io/collector/model v0.43.3-0.20220201020338-caead4c4b0e2
)

require (
Expand Down
9 changes: 6 additions & 3 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.43.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.43.1
go.opentelemetry.io/collector/model v0.43.1
go.opentelemetry.io/collector v0.43.3-0.20220201020338-caead4c4b0e2
go.opentelemetry.io/collector/model v0.43.3-0.20220201020338-caead4c4b0e2
go.uber.org/zap v1.20.0
)

Expand Down
13 changes: 8 additions & 5 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.

4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/logs_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ func createSimpleLogData(numberOfLogs int) pdata.Logs {

for i := 0; i < numberOfLogs; i++ {
ts := pdata.Timestamp(int64(i) * time.Millisecond.Nanoseconds())
logRecord := ill.Logs().AppendEmpty()
logRecord := ill.LogRecords().AppendEmpty()
logRecord.Body().SetStringVal("mylog")
logRecord.Attributes().InsertString(conventions.AttributeServiceName, "myapp")
logRecord.Attributes().InsertString("my-label", "myapp-type")
logRecord.Attributes().InsertString(conventions.AttributeHostName, "myhost")
logRecord.Attributes().InsertString("custom", "custom")
logRecord.SetTimestamp(ts)
}
ill.Logs().AppendEmpty()
ill.LogRecords().AppendEmpty()

return logs
}
Expand Down
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 @@ -52,7 +52,7 @@ func logDataToLogService(ld pdata.Logs) []*sls.Log {
for j := 0; j < ills.Len(); j++ {
ils := ills.At(j)
instrumentationLibraryContents := instrumentationLibraryToLogContents(ils.InstrumentationLibrary())
logs := ils.Logs()
logs := ils.LogRecords()
for j := 0; j < logs.Len(); j++ {
slsLog := mapLogRecordToLogService(logs.At(j), resourceContents, instrumentationLibraryContents)
if slsLog != nil {
Expand Down
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func createLogData(numberOfLogs int) pdata.Logs {

for i := 0; i < numberOfLogs; i++ {
ts := pdata.Timestamp(int64(i) * time.Millisecond.Nanoseconds())
logRecord := ill.Logs().AppendEmpty()
logRecord := ill.LogRecords().AppendEmpty()
switch i {
case 0:
// do nothing, left body null
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 @@ -154,7 +154,7 @@ func logsToCWLogs(logger *zap.Logger, ld pdata.Logs) ([]*cloudwatchlogs.InputLog
ills := rl.InstrumentationLibraryLogs()
for j := 0; j < ills.Len(); j++ {
ils := ills.At(j)
logs := ils.Logs()
logs := ils.LogRecords()
for k := 0; k < logs.Len(); k++ {
log := logs.At(k)
event, err := logToCWLog(resourceAttrs, log)
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 @@ -245,7 +245,7 @@ func TestConsumeLogs(t *testing.T) {
ld := pdata.NewLogs()
r := ld.ResourceLogs().AppendEmpty()
r.Resource().Attributes().UpsertString("hello", "test")
logRecords := r.InstrumentationLibraryLogs().AppendEmpty().Logs()
logRecords := r.InstrumentationLibraryLogs().AppendEmpty().LogRecords()
logRecords.EnsureCapacity(5)
logRecords.AppendEmpty().SetName("test")
assert.Equal(t, 1, ld.LogRecordCount())
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.43.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.43.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.43.1
go.opentelemetry.io/collector/model v0.43.1
go.opentelemetry.io/collector v0.43.3-0.20220201020338-caead4c4b0e2
go.opentelemetry.io/collector/model v0.43.3-0.20220201020338-caead4c4b0e2
go.uber.org/zap v1.20.0
)

Expand Down
13 changes: 8 additions & 5 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.

4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.43.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.43.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.43.1
go.opentelemetry.io/collector/model v0.43.1
go.opentelemetry.io/collector v0.43.3-0.20220201020338-caead4c4b0e2
go.opentelemetry.io/collector/model v0.43.3-0.20220201020338-caead4c4b0e2
go.uber.org/zap v1.20.0
google.golang.org/protobuf v1.27.1
)
Expand Down
10 changes: 6 additions & 4 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.

Loading