Upgrade otel collector, fix removing of the StringValue (#1417)

Signed-off-by: Bogdan Drutu <[email protected]>
asuresh4 · Oct 29, 2020 · a7c48ef · a7c48ef
1 parent 1b51650
commit a7c48ef
Show file tree

Hide file tree

Showing 114 changed files with 13,699 additions and 162 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -7,7 +7,7 @@ require (
  github.com/census-instrumentation/opencensus-proto v0.3.0
  github.com/gogo/protobuf v1.3.1
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
+ go.opentelemetry.io/collector v0.13.1-0.20201029201142-77f3e6d85f56
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.25.0
 )
diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -8,6 +8,6 @@ require (
  github.com/golang/protobuf v1.4.2
  github.com/google/uuid v1.1.2
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
+ go.opentelemetry.io/collector v0.13.1-0.20201029201142-77f3e6d85f56
  go.uber.org/zap v1.16.0
 )
diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
diff --git a/exporter/awsemfexporter/metric_translator.go b/exporter/awsemfexporter/metric_translator.go
@@ -292,8 +292,8 @@ func createDimensions(dp DataPoint, instrumentationLibName string, dimensionRoll
 
  dimensionSlice := make([]string, dimensionKV.Len(), dimensionKV.Len()+1)
  idx := 0
- dimensionKV.ForEach(func(k string, v pdata.StringValue) {
- fields[k] = v.Value()
+ dimensionKV.ForEach(func(k string, v string) {
+ fields[k] = v
  dimensionSlice[idx] = k
  idx++
  })

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -6,7 +6,7 @@ require (
  github.com/aws/aws-sdk-go v1.35.17
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
+ go.opentelemetry.io/collector v0.13.1-0.20201029201142-77f3e6d85f56
  go.uber.org/zap v1.16.0
  golang.org/x/net v0.0.0-20200822124328-c89045814202
  google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -7,7 +7,7 @@ require (
  github.com/microsoft/ApplicationInsights-Go v0.4.3
  github.com/stretchr/testify v1.6.1
  github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
- go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
+ go.opentelemetry.io/collector v0.13.1-0.20201029201142-77f3e6d85f56
  go.uber.org/zap v1.16.0
  golang.org/x/net v0.0.0-20200822124328-c89045814202
  google.golang.org/grpc v1.32.0

diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum
diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod
@@ -5,7 +5,7 @@ go 1.14
 require (
  github.com/census-instrumentation/opencensus-proto v0.3.0
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
+ go.opentelemetry.io/collector v0.13.1-0.20201029201142-77f3e6d85f56
  go.uber.org/zap v1.16.0
  google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
 )
diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum
diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod
@@ -10,7 +10,7 @@ require (
  github.com/stretchr/testify v1.6.1
  github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect
  go.opencensus.io v0.22.4
- go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
+ go.opentelemetry.io/collector v0.13.1-0.20201029201142-77f3e6d85f56
  go.uber.org/zap v1.16.0
  gopkg.in/DataDog/dd-trace-go.v1 v1.26.0
  gopkg.in/zorkian/go-datadog-api.v2 v2.30.0

diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum
diff --git a/exporter/datadogexporter/metrics_translator.go b/exporter/datadogexporter/metrics_translator.go
@@ -28,8 +28,7 @@ import (
 // getTags maps a stringMap into a slice of Datadog tags
 func getTags(labels pdata.StringMap) []string {
  tags := make([]string, 0, labels.Len())
- labels.ForEach(func(key string, v pdata.StringValue) {
- value := v.Value()
+ labels.ForEach(func(key string, value string) {
  if value == "" {
  // Tags can't end with ":" so we replace empty values with "n/a"
  value = "n/a"

diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod
@@ -6,7 +6,7 @@ require (
  github.com/stretchr/testify v1.6.1
  go.elastic.co/apm v1.8.1-0.20200515083825-95e54b2e24ea
  go.elastic.co/fastjson v1.1.0
- go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
+ go.opentelemetry.io/collector v0.13.1-0.20201029201142-77f3e6d85f56
  go.uber.org/zap v1.16.0
  google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
 )
diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum
diff --git a/exporter/elasticexporter/internal/translator/elastic/metrics.go b/exporter/elasticexporter/internal/translator/elastic/metrics.go
@@ -164,10 +164,10 @@ func asTime(in pdata.TimestampUnixNano) model.Time {
 func asStringMap(in pdata.StringMap) model.StringMap {
  var out model.StringMap
  in.Sort()
- in.ForEach(func(k string, v pdata.StringValue) {
+ in.ForEach(func(k string, v string) {
  out = append(out, model.StringMapItem{
  Key: k,
- Value: v.Value(),
+ Value: v,
  })
  })
  return out

diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/honeycombio/libhoney-go v1.14.1
  github.com/klauspost/compress v1.11.1
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
+ go.opentelemetry.io/collector v0.13.1-0.20201029201142-77f3e6d85f56
  go.uber.org/zap v1.16.0
  google.golang.org/grpc v1.32.0
  google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect

diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum
diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/google/go-cmp v0.5.2
  github.com/jaegertracing/jaeger v1.20.0
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201029180312-7ddd2428e51e
+ go.opentelemetry.io/collector v0.13.1-0.20201029201142-77f3e6d85f56
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.25.0
 )