Change to use the new collector/semconv instead of model package (ope…

…n-telemetry#9393) Signed-off-by: Bogdan Drutu <[email protected]>
observIQ · Apr 21, 2022 · c0f2f7b · c0f2f7b
1 parent 3eda2f7
commit c0f2f7b
Show file tree

Hide file tree

Showing 356 changed files with 459 additions and 734 deletions.
diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod
@@ -443,6 +443,7 @@ require (
  go.mongodb.org/atlas v0.15.0 // indirect
  go.opencensus.io v0.23.0 // indirect
  go.opentelemetry.io/collector/model v0.49.0 // indirect
+ go.opentelemetry.io/collector/semconv v0.0.0-20220421154122-427f7dde5a8f // indirect
  go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.31.0 // indirect
  go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0 // indirect
  go.opentelemetry.io/otel v1.6.3 // indirect

diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum
diff --git a/cmd/mdatagen/metrics_v2.tmpl b/cmd/mdatagen/metrics_v2.tmpl
@@ -12,7 +12,7 @@ import (
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/pmetric"
  {{- if .SemConvVersion }}
- conventions "go.opentelemetry.io/collector/model/semconv/v{{ .SemConvVersion }}"
+ conventions "go.opentelemetry.io/collector/semconv/v{{ .SemConvVersion }}"
  {{- end }}
 )
 

diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -8,8 +8,8 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.49.0
  github.com/stretchr/testify v1.7.1
  go.opentelemetry.io/collector v0.49.0
- go.opentelemetry.io/collector/model v0.49.0
  go.opentelemetry.io/collector/pdata v0.49.0
+ go.opentelemetry.io/collector/semconv v0.0.0-20220421154122-427f7dde5a8f
  go.uber.org/zap v1.21.0
 )
 

diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go b/exporter/alibabacloudlogserviceexporter/logs_exporter_test.go
@@ -24,9 +24,9 @@ import (
  "github.com/stretchr/testify/require"
  "go.opentelemetry.io/collector/component/componenttest"
  "go.opentelemetry.io/collector/config"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/plog"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 func createSimpleLogData(numberOfLogs int) plog.Logs {

diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go
@@ -21,9 +21,9 @@ import (
 
  sls "github.com/aliyun/aliyun-log-go-sdk"
  "github.com/gogo/protobuf/proto"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/plog"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 const (

diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go
@@ -21,9 +21,9 @@ import (
  "time"
 
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/plog"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 func getComplexAttributeValueMap() pcommon.Value {

diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go
@@ -24,9 +24,9 @@ import (
  "time"
 
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 type logKeyValuePair struct {

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -14,8 +14,8 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.49.0
  github.com/stretchr/testify v1.7.1
  go.opentelemetry.io/collector v0.49.0
- go.opentelemetry.io/collector/model v0.49.0
  go.opentelemetry.io/collector/pdata v0.49.0
+ go.opentelemetry.io/collector/semconv v0.0.0-20220421154122-427f7dde5a8f
  go.uber.org/zap v1.21.0
  google.golang.org/protobuf v1.28.0
 )

diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
diff --git a/exporter/awsemfexporter/grouped_metric_test.go b/exporter/awsemfexporter/grouped_metric_test.go
@@ -24,8 +24,8 @@ import (
  metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
  resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pmetric"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
  "go.uber.org/zap"
  "go.uber.org/zap/zapcore"
  "go.uber.org/zap/zaptest/observer"

diff --git a/exporter/awsemfexporter/metric_translator_test.go b/exporter/awsemfexporter/metric_translator_test.go
@@ -28,9 +28,9 @@ import (
  "github.com/golang/protobuf/ptypes/timestamp"
  "github.com/golang/protobuf/ptypes/wrappers"
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/pmetric"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
  "go.uber.org/zap"
  "go.uber.org/zap/zapcore"
  "go.uber.org/zap/zaptest/observer"

diff --git a/exporter/awsemfexporter/util.go b/exporter/awsemfexporter/util.go
@@ -20,9 +20,9 @@ import (
  "strings"
  "time"
 
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/pmetric"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
  "go.uber.org/zap"
 )
 

diff --git a/exporter/awsemfexporter/util_test.go b/exporter/awsemfexporter/util_test.go
@@ -21,9 +21,9 @@ import (
  agentmetricspb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1"
  resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/pmetric"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
  "go.uber.org/zap"
 
  internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod
@@ -36,7 +36,7 @@ require (
  github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
  github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
  go.opencensus.io v0.23.0 // indirect
- go.opentelemetry.io/collector/model v0.49.0 // indirect
+ go.opentelemetry.io/collector/semconv v0.0.0-20220421154122-427f7dde5a8f // indirect
  go.opentelemetry.io/otel v1.6.3 // indirect
  go.opentelemetry.io/otel/metric v0.29.0 // indirect
  go.opentelemetry.io/otel/trace v1.6.3 // indirect

diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum
diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod
@@ -39,8 +39,8 @@ require (
  github.com/tidwall/tinylru v1.1.0 // indirect
  github.com/tidwall/wal v1.1.7 // indirect
  go.opencensus.io v0.23.0 // indirect
- go.opentelemetry.io/collector/model v0.49.0 // indirect
  go.opentelemetry.io/collector/pdata v0.49.0 // indirect
+ go.opentelemetry.io/collector/semconv v0.0.0-20220421154122-427f7dde5a8f // indirect
  go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0 // indirect
  go.opentelemetry.io/otel v1.6.3 // indirect
  go.opentelemetry.io/otel/metric v0.29.0 // indirect

diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum
diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go
@@ -27,9 +27,9 @@ import (
  "go.opentelemetry.io/collector/component"
  "go.opentelemetry.io/collector/component/componenttest"
  "go.opentelemetry.io/collector/config"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
  "go.uber.org/zap"
 
  "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -8,8 +8,8 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.49.0
  github.com/stretchr/testify v1.7.1
  go.opentelemetry.io/collector v0.49.0
- go.opentelemetry.io/collector/model v0.49.0
  go.opentelemetry.io/collector/pdata v0.49.0
+ go.opentelemetry.io/collector/semconv v0.0.0-20220421154122-427f7dde5a8f
  go.uber.org/zap v1.21.0
 )
 

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
diff --git a/exporter/awsxrayexporter/internal/translator/aws.go b/exporter/awsxrayexporter/internal/translator/aws.go
@@ -19,8 +19,8 @@ import (
  "strconv"
 
  "github.com/aws/aws-sdk-go/aws"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 
  awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )

diff --git a/exporter/awsxrayexporter/internal/translator/aws_test.go b/exporter/awsxrayexporter/internal/translator/aws_test.go
@@ -19,8 +19,8 @@ import (
 
  "github.com/aws/aws-sdk-go/aws"
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 
  awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )

diff --git a/exporter/awsxrayexporter/internal/translator/cause.go b/exporter/awsxrayexporter/internal/translator/cause.go
@@ -22,9 +22,9 @@ import (
  "strings"
 
  "github.com/aws/aws-sdk-go/aws"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 
  awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )

diff --git a/exporter/awsxrayexporter/internal/translator/cause_test.go b/exporter/awsxrayexporter/internal/translator/cause_test.go
@@ -20,9 +20,9 @@ import (
  "time"
 
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 func TestCauseWithExceptions(t *testing.T) {

diff --git a/exporter/awsxrayexporter/internal/translator/http.go b/exporter/awsxrayexporter/internal/translator/http.go
@@ -18,9 +18,9 @@ import (
  "strconv"
 
  "github.com/aws/aws-sdk-go/aws"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 
  awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )

diff --git a/exporter/awsxrayexporter/internal/translator/http_test.go b/exporter/awsxrayexporter/internal/translator/http_test.go
@@ -20,9 +20,9 @@ import (
  "time"
 
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 func TestClientSpanWithURLAttribute(t *testing.T) {

diff --git a/exporter/awsxrayexporter/internal/translator/segment.go b/exporter/awsxrayexporter/internal/translator/segment.go
@@ -25,9 +25,9 @@ import (
  "time"
 
  awsP "github.com/aws/aws-sdk-go/aws"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.8.0"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
+ conventions "go.opentelemetry.io/collector/semconv/v1.8.0"
 
  awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )

diff --git a/exporter/awsxrayexporter/internal/translator/segment_test.go b/exporter/awsxrayexporter/internal/translator/segment_test.go
@@ -23,9 +23,9 @@ import (
  "time"
 
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.8.0"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
+ conventions "go.opentelemetry.io/collector/semconv/v1.8.0"
 
  awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )

diff --git a/exporter/awsxrayexporter/internal/translator/service.go b/exporter/awsxrayexporter/internal/translator/service.go
@@ -15,8 +15,8 @@
 package translator // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator"
 
 import (
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 
  awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )

diff --git a/exporter/awsxrayexporter/internal/translator/service_test.go b/exporter/awsxrayexporter/internal/translator/service_test.go
@@ -19,8 +19,8 @@ import (
  "testing"
 
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 func TestServiceFromResource(t *testing.T) {

diff --git a/exporter/awsxrayexporter/internal/translator/sql.go b/exporter/awsxrayexporter/internal/translator/sql.go
@@ -15,8 +15,8 @@
 package translator // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/translator"
 
 import (
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 
  awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )

diff --git a/exporter/awsxrayexporter/internal/translator/sql_test.go b/exporter/awsxrayexporter/internal/translator/sql_test.go
@@ -19,8 +19,8 @@ import (
  "testing"
 
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 func TestClientSpanWithStatementAttribute(t *testing.T) {

diff --git a/exporter/awsxrayexporter/internal/translator/writer_pool_test.go b/exporter/awsxrayexporter/internal/translator/writer_pool_test.go
@@ -20,9 +20,9 @@ import (
  "testing"
 
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
  "go.opentelemetry.io/collector/pdata/ptrace"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
  "go.uber.org/zap"
 )
 

diff --git a/exporter/azuremonitorexporter/conventions.go b/exporter/azuremonitorexporter/conventions.go
@@ -17,8 +17,8 @@ package azuremonitorexporter // import "github.com/open-telemetry/opentelemetry-
 import (
  "strconv"
 
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 /*

diff --git a/exporter/azuremonitorexporter/conventions_test.go b/exporter/azuremonitorexporter/conventions_test.go
@@ -18,8 +18,8 @@ import (
  "testing"
 
  "github.com/stretchr/testify/assert"
- conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1"
  "go.opentelemetry.io/collector/pdata/pcommon"
+ conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
 )
 
 func TestHTTPAttributeMapping(t *testing.T) {

diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -6,8 +6,8 @@ require (
  github.com/microsoft/ApplicationInsights-Go v0.4.4
  github.com/stretchr/testify v1.7.1
  go.opentelemetry.io/collector v0.49.0
- go.opentelemetry.io/collector/model v0.49.0
  go.opentelemetry.io/collector/pdata v0.49.0
+ go.opentelemetry.io/collector/semconv v0.0.0-20220421154122-427f7dde5a8f
  go.uber.org/zap v1.21.0
  golang.org/x/net v0.0.0-20220225172249-27dd8689420f
 )