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

[chore] Upgrade core dependency #14544

Merged
merged 1 commit into from
Sep 27, 2022
Merged

[chore] Upgrade core dependency #14544

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.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.60.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
golang.org/x/text v0.3.7
)
Expand Down Expand Up @@ -563,8 +563,8 @@ require (
go.mongodb.org/atlas v0.16.0 // indirect
go.mongodb.org/mongo-driver v1.10.2 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002 // indirect
go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002 // indirect
go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6 // indirect
go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect
go.opentelemetry.io/contrib/zpages v0.36.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.1
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6
go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6
)

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 cmd/mdatagen/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (mvt *ValueType) UnmarshalText(text []byte) error {
case "":
mvt.ValueType = pcommon.ValueTypeEmpty
case "string":
mvt.ValueType = pcommon.ValueTypeString
mvt.ValueType = pcommon.ValueTypeStr
case "int":
mvt.ValueType = pcommon.ValueTypeInt
case "double":
Expand All @@ -84,7 +84,7 @@ func (mvt ValueType) String() string {
// Primitive returns name of primitive type for the ValueType.
func (mvt ValueType) Primitive() string {
switch mvt.ValueType {
case pcommon.ValueTypeString:
case pcommon.ValueTypeStr:
return "string"
case pcommon.ValueTypeInt:
return "int64"
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/s3mapprovider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/aws/aws-sdk-go-v2/config v1.10.1
github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6
gopkg.in/yaml.v2 v2.4.0
)

Expand Down
4 changes: 2 additions & 2 deletions confmap/provider/s3mapprovider/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.60.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6
go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6
go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6
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/logs_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func createSimpleLogData(numberOfLogs int) plog.Logs {
for i := 0; i < numberOfLogs; i++ {
ts := pcommon.Timestamp(int64(i) * time.Millisecond.Nanoseconds())
logRecord := sl.LogRecords().AppendEmpty()
logRecord.Body().SetStringVal("mylog")
logRecord.Body().SetStr("mylog")
logRecord.Attributes().PutString(conventions.AttributeServiceName, "myapp")
logRecord.Attributes().PutString("my-label", "myapp-type")
logRecord.Attributes().PutString(conventions.AttributeHostName, "myhost")
Expand Down
18 changes: 9 additions & 9 deletions exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func fillComplexAttributeValueMap(m pcommon.Map) {
m.PutDouble("value", 1.3)
m.PutInt("code", 200)
m.PutEmpty("null")
m.PutEmptySlice("array").AppendEmpty().SetStringVal("array")
m.PutEmptySlice("array").AppendEmpty().SetStr("array")
m.PutEmptyMap("map").PutString("data", "hello world")
m.PutString("status", "ok")
}
Expand All @@ -55,21 +55,21 @@ func createLogData(numberOfLogs int) plog.Logs {
case 0:
// do nothing, left body null
case 1:
logRecord.Body().SetBoolVal(true)
logRecord.Body().SetBool(true)
case 2:
logRecord.Body().SetIntVal(2.0)
logRecord.Body().SetInt(2.0)
case 3:
logRecord.Body().SetDoubleVal(3.0)
logRecord.Body().SetDouble(3.0)
case 4:
logRecord.Body().SetStringVal("4")
logRecord.Body().SetStr("4")
case 5:
fillComplexAttributeValueMap(logRecord.Attributes().PutEmptyMap("map-value"))
logRecord.Body().SetStringVal("log contents")
logRecord.Body().SetStr("log contents")
case 6:
logRecord.Attributes().PutEmptySlice("array-value").AppendEmpty().SetStringVal("array")
logRecord.Body().SetStringVal("log contents")
logRecord.Attributes().PutEmptySlice("array-value").AppendEmpty().SetStr("array")
logRecord.Body().SetStr("log contents")
default:
logRecord.Body().SetStringVal("log contents")
logRecord.Body().SetStr("log contents")
}
logRecord.Attributes().PutString(conventions.AttributeServiceName, "myapp")
logRecord.Attributes().PutString("my-label", "myapp-type")
Expand Down
14 changes: 7 additions & 7 deletions exporter/awscloudwatchlogsexporter/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,22 +226,22 @@ func attrsValue(attrs pcommon.Map) map[string]interface{} {
func attrValue(value pcommon.Value) interface{} {
switch value.Type() {
case pcommon.ValueTypeInt:
return value.IntVal()
return value.Int()
case pcommon.ValueTypeBool:
return value.BoolVal()
return value.Bool()
case pcommon.ValueTypeDouble:
return value.DoubleVal()
case pcommon.ValueTypeString:
return value.StringVal()
return value.Double()
case pcommon.ValueTypeStr:
return value.Str()
case pcommon.ValueTypeMap:
values := map[string]interface{}{}
value.MapVal().Range(func(k string, v pcommon.Value) bool {
value.Map().Range(func(k string, v pcommon.Value) bool {
values[k] = attrValue(v)
return true
})
return values
case pcommon.ValueTypeSlice:
arrayVal := value.SliceVal()
arrayVal := value.Slice()
values := make([]interface{}, arrayVal.Len())
for i := 0; i < arrayVal.Len(); i++ {
values[i] = attrValue(arrayVal.At(i))
Expand Down
8 changes: 4 additions & 4 deletions exporter/awscloudwatchlogsexporter/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func testLogRecord() plog.LogRecord {
record.SetSeverityNumber(5)
record.SetSeverityText("debug")
record.SetDroppedAttributesCount(4)
record.Body().SetStringVal("hello world")
record.Body().SetStr("hello world")
record.Attributes().PutInt("key1", 1)
record.Attributes().PutString("key2", "attr2")
record.SetTraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16})
Expand All @@ -144,7 +144,7 @@ func testLogRecordWithoutTrace() plog.LogRecord {
record.SetSeverityNumber(5)
record.SetSeverityText("debug")
record.SetDroppedAttributesCount(4)
record.Body().SetStringVal("hello world")
record.Body().SetStr("hello world")
record.Attributes().PutInt("key1", 1)
record.Attributes().PutString("key2", "attr2")
record.SetTimestamp(1609719139000000)
Expand Down Expand Up @@ -181,7 +181,7 @@ func TestAttrValue(t *testing.T) {
name: "map",
value: func() pcommon.Value {
mAttr := pcommon.NewValueMap()
m := mAttr.MapVal()
m := mAttr.Map()
m.PutString("key1", "value1")
m.PutEmpty("key2")
m.PutBool("key3", true)
Expand All @@ -201,7 +201,7 @@ func TestAttrValue(t *testing.T) {
name: "array",
value: func() pcommon.Value {
arrAttr := pcommon.NewValueSlice()
arr := arrAttr.SliceVal()
arr := arrAttr.Slice()
for _, av := range []pcommon.Value{
pcommon.NewValueDouble(1.2),
pcommon.NewValueDouble(1.6),
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.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.60.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6
go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6
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.

2 changes: 1 addition & 1 deletion exporter/awsemfexporter/emf_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (emf *emfExporter) pushMetricsData(_ context.Context, md pmetric.Metrics) e
am := rm.Resource().Attributes()
if am.Len() > 0 {
am.Range(func(k string, v pcommon.Value) bool {
labels[k] = v.StringVal()
labels[k] = v.Str()
return true
})
}
Expand Down
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.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector/pdata v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector/semconv v0.60.1-0.20220923151520-96e9af35c002
go.opentelemetry.io/collector v0.60.1-0.20220927015850-e98116922cf6
go.opentelemetry.io/collector/pdata v0.60.1-0.20220927015850-e98116922cf6
go.opentelemetry.io/collector/semconv v0.60.1-0.20220927015850-e98116922cf6
go.uber.org/zap v1.23.0
google.golang.org/protobuf v1.28.1
)
Expand Down
Loading