chore: update OpenTelemetry to v0.38.1-0.20211103215828-cffbecb2ac9e

influxdata · Nov 4, 2021 · bde918d · bde918d
1 parent abe8a92
commit bde918d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/common/common.go b/common/common.go
@@ -105,7 +105,7 @@ func AttributeValueToInfluxTagValue(value pdata.AttributeValue) (string, error)
  return string(jsonBytes), nil
  }
  case pdata.AttributeValueTypeArray:
- if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.ArrayVal())); err != nil {
+ if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.SliceVal())); err != nil {
  return "", err
  } else {
  return string(jsonBytes), nil
@@ -134,7 +134,7 @@ func AttributeValueToInfluxFieldValue(value pdata.AttributeValue) (interface{},
  return string(jsonBytes), nil
  }
  case pdata.AttributeValueTypeArray:
- if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.ArrayVal())); err != nil {
+ if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.SliceVal())); err != nil {
  return nil, err
  } else {
  return string(jsonBytes), nil
@@ -161,7 +161,7 @@ func otlpKeyValueListToMap(kvList pdata.AttributeMap) map[string]interface{} {
  case pdata.AttributeValueTypeMap:
  m[k] = otlpKeyValueListToMap(v.MapVal())
  case pdata.AttributeValueTypeArray:
- m[k] = otlpArrayToSlice(v.ArrayVal())
+ m[k] = otlpArrayToSlice(v.SliceVal())
  case pdata.AttributeValueTypeEmpty:
  m[k] = nil
  default:
@@ -172,7 +172,7 @@ func otlpKeyValueListToMap(kvList pdata.AttributeMap) map[string]interface{} {
  return m
 }
 
-func otlpArrayToSlice(arr pdata.AnyValueArray) []interface{} {
+func otlpArrayToSlice(arr pdata.AttributeValueSlice) []interface{} {
  s := make([]interface{}, 0, arr.Len())
  for i := 0; i < arr.Len(); i++ {
  v := arr.At(i)

diff --git a/common/go.mod b/common/go.mod
@@ -2,4 +2,4 @@ module github.com/influxdata/influxdb-observability/common
 
 go 1.16
 
-require go.opentelemetry.io/collector/model v0.38.0
+require go.opentelemetry.io/collector/model v0.38.1-0.20211103215828-cffbecb2ac9e
diff --git a/common/go.sum b/common/go.sum
diff --git a/influx2otel/go.mod b/influx2otel/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
  github.com/influxdata/influxdb-observability/common v0.2.8
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector/model v0.38.0
+ go.opentelemetry.io/collector/model v0.38.1-0.20211103215828-cffbecb2ac9e
 )
 
 replace github.com/influxdata/influxdb-observability/common => ../common
diff --git a/influx2otel/go.sum b/influx2otel/go.sum
diff --git a/otel2influx/common.go b/otel2influx/common.go
@@ -50,7 +50,7 @@ func AttributeValueToInfluxTagValue(value pdata.AttributeValue) (string, error)
  return string(jsonBytes), nil
  }
  case pdata.AttributeValueTypeArray:
- if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.ArrayVal())); err != nil {
+ if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.SliceVal())); err != nil {
  return "", err
  } else {
  return string(jsonBytes), nil
@@ -79,7 +79,7 @@ func AttributeValueToInfluxFieldValue(value pdata.AttributeValue) (interface{},
  return string(jsonBytes), nil
  }
  case pdata.AttributeValueTypeArray:
- if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.ArrayVal())); err != nil {
+ if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.SliceVal())); err != nil {
  return nil, err
  } else {
  return string(jsonBytes), nil
@@ -106,7 +106,7 @@ func otlpKeyValueListToMap(kvList pdata.AttributeMap) map[string]interface{} {
  case pdata.AttributeValueTypeMap:
  m[k] = otlpKeyValueListToMap(v.MapVal())
  case pdata.AttributeValueTypeArray:
- m[k] = otlpArrayToSlice(v.ArrayVal())
+ m[k] = otlpArrayToSlice(v.SliceVal())
  case pdata.AttributeValueTypeEmpty:
  m[k] = nil
  default:
@@ -117,7 +117,7 @@ func otlpKeyValueListToMap(kvList pdata.AttributeMap) map[string]interface{} {
  return m
 }
 
-func otlpArrayToSlice(arr pdata.AnyValueArray) []interface{} {
+func otlpArrayToSlice(arr pdata.AttributeValueSlice) []interface{} {
  s := make([]interface{}, 0, arr.Len())
  for i := 0; i < arr.Len(); i++ {
  v := arr.At(i)

diff --git a/otel2influx/go.mod b/otel2influx/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
  github.com/influxdata/influxdb-observability/common v0.2.8
  github.com/stretchr/testify v1.7.0
- go.opentelemetry.io/collector/model v0.38.0
+ go.opentelemetry.io/collector/model v0.38.1-0.20211103215828-cffbecb2ac9e
 )
 
 replace github.com/influxdata/influxdb-observability/common => ../common
diff --git a/otel2influx/go.sum b/otel2influx/go.sum