Skip to content

Commit

Permalink
awsxrayexporter: migrate to latest semconv version (open-telemetry#35347
Browse files Browse the repository at this point in the history
)

Description: The version of semconv is upgraded from v1.6.1 to v1.12.0

This is a trivial migration. The semconv attributes' value have been
compared using
[go-otel-semconv-comparator](https://github.com/narcis96/go-otel-semconv-comparator)
resulting in 0 diffs:

- all attributes of 1.6.1 exists and have the same value inside 1.12.0

Link to tracking Issue:
open-telemetry#22095

Testing: Tests passed
  • Loading branch information
narcis96 authored and jriguera committed Oct 4, 2024
1 parent b9da76d commit 48168ea
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/awsxray_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"go.opentelemetry.io/collector/exporter/exportertest"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil"
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/aws/aws-sdk-go/aws"
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/aws_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/stretchr/testify/assert"
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/cause.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/cause_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"
)

func TestCauseWithExceptions(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"
)

func TestClientSpanWithURLAttribute(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/segment.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.8.0"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.8.0"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package translator // import "github.com/open-telemetry/opentelemetry-collector-

import (
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pcommon"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"
)

func TestServiceFromResource(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/sql.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package translator // import "github.com/open-telemetry/opentelemetry-collector-
import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"

awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/internal/translator/sql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"
)

func TestClientSpanWithStatementAttribute(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
conventions "go.opentelemetry.io/collector/semconv/v1.6.1"
conventions "go.opentelemetry.io/collector/semconv/v1.12.0"
"go.uber.org/zap"
)

Expand Down

0 comments on commit 48168ea

Please sign in to comment.