[chore] update otel (open-telemetry#10589)

* [chore] update otel Syncing up the core repo. * update deprecated methods * update deprecated methods
sakulali · Jun 6, 2022 · fe0aa83 · fe0aa83
1 parent 2f9afce
commit fe0aa83
Show file tree

Hide file tree

Showing 358 changed files with 1,754 additions and 2,663 deletions.
diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -8,8 +8,8 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib v0.52.0
  github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.52.0
  github.com/stretchr/testify v1.7.1
- go.opentelemetry.io/collector v0.52.0
- go.opentelemetry.io/collector/pdata v0.52.0
+ go.opentelemetry.io/collector v0.52.1-0.20220603175357-6fb884b2dbdc
+ go.opentelemetry.io/collector/pdata v0.52.1-0.20220603175357-6fb884b2dbdc
  go.uber.org/multierr v1.8.0
  golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3
  golang.org/x/text v0.3.7
@@ -481,7 +481,7 @@ require (
  go.mongodb.org/atlas v0.16.0 // indirect
  go.mongodb.org/mongo-driver v1.9.1 // indirect
  go.opencensus.io v0.23.0 // indirect
- go.opentelemetry.io/collector/semconv v0.52.0 // indirect
+ go.opentelemetry.io/collector/semconv v0.52.1-0.20220603175357-6fb884b2dbdc // indirect
  go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 // indirect
  go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 // indirect
  go.opentelemetry.io/contrib/zpages v0.32.0 // indirect
@@ -514,7 +514,7 @@ require (
  gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
  gopkg.in/square/go-jose.v2 v2.5.1 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
- gopkg.in/yaml.v3 v3.0.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
  gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect
  k8s.io/api v0.24.1 // indirect
  k8s.io/apimachinery v0.24.1 // indirect

diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod
@@ -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.7.1
- go.opentelemetry.io/collector v0.52.0
- go.opentelemetry.io/collector/pdata v0.52.0
+ go.opentelemetry.io/collector v0.52.1-0.20220603175357-6fb884b2dbdc
+ go.opentelemetry.io/collector/pdata v0.52.1-0.20220603175357-6fb884b2dbdc
 )
 
 require (
@@ -22,18 +22,15 @@ require (
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/pelletier/go-toml v1.9.4 // indirect
- github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  go.uber.org/atomic v1.9.0 // indirect
  go.uber.org/multierr v1.8.0 // indirect
- go.uber.org/zap v1.21.0 // indirect
  golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect
  golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
  golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
  golang.org/x/text v0.3.7 // indirect
  google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
  google.golang.org/grpc v1.47.0 // indirect
  google.golang.org/protobuf v1.28.0 // indirect
- gopkg.in/yaml.v2 v2.4.0 // indirect
- gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum
diff --git a/cmd/mdatagen/loader.go b/cmd/mdatagen/loader.go
@@ -25,7 +25,7 @@ import (
  "github.com/go-playground/validator/v10"
  "github.com/go-playground/validator/v10/non-standard/validators"
  en_translations "github.com/go-playground/validator/v10/translations/en"
- "go.opentelemetry.io/collector/config/mapprovider/filemapprovider"
+ "go.opentelemetry.io/collector/confmap/provider/fileprovider"
  "go.opentelemetry.io/collector/pdata/pcommon"
 )
 
@@ -172,12 +172,12 @@ type templateContext struct {
 }
 
 func loadMetadata(filePath string) (metadata, error) {
- cp, err := filemapprovider.New().Retrieve(context.Background(), "file:"+filePath, nil)
+ cp, err := fileprovider.New().Retrieve(context.Background(), "file:"+filePath, nil)
  if err != nil {
  return metadata{}, err
  }
 
- m, err := cp.AsMap()
+ m, err := cp.AsConf()
  if err != nil {
  return metadata{}, err
  }

diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -7,9 +7,9 @@ require (
  github.com/gogo/protobuf v1.3.2
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.52.0
  github.com/stretchr/testify v1.7.1
- go.opentelemetry.io/collector v0.52.0
- go.opentelemetry.io/collector/pdata v0.52.0
- go.opentelemetry.io/collector/semconv v0.52.0
+ go.opentelemetry.io/collector v0.52.1-0.20220603175357-6fb884b2dbdc
+ go.opentelemetry.io/collector/pdata v0.52.1-0.20220603175357-6fb884b2dbdc
+ go.opentelemetry.io/collector/semconv v0.52.1-0.20220603175357-6fb884b2dbdc
  go.uber.org/zap v1.21.0
 )
 
@@ -43,8 +43,7 @@ require (
  google.golang.org/grpc v1.47.0 // indirect
  google.golang.org/protobuf v1.28.0 // indirect
  gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
- gopkg.in/yaml.v2 v2.4.0 // indirect
- gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal