Skip to content

Commit 1d20135

Browse files
committed
upgraded opentelemetry client to OTEL v1.17.0
* NOTE: otel v1.17.0 is the last version supporting go1.19. more recent otel packages (now v1.21.0) require go1.20. Signed-off-by: Frederic BIDON <fredbi@yahoo.com>
1 parent 381952b commit 1d20135

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

client/opentelemetry.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import (
1111
"go.opentelemetry.io/otel/attribute"
1212
"go.opentelemetry.io/otel/codes"
1313
"go.opentelemetry.io/otel/propagation"
14-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
14+
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
15+
"go.opentelemetry.io/otel/semconv/v1.17.0/httpconv"
1516
"go.opentelemetry.io/otel/trace"
1617
)
1718

@@ -131,8 +132,11 @@ func (t *openTelemetryTransport) Submit(op *runtime.ClientOperation) (interface{
131132
op.Reader = runtime.ClientResponseReaderFunc(func(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) {
132133
if span != nil {
133134
statusCode := response.Code()
134-
span.SetAttributes(attribute.Int(string(semconv.HTTPStatusCodeKey), statusCode))
135-
span.SetStatus(semconv.SpanStatusFromHTTPStatusCodeAndSpanKind(statusCode, trace.SpanKindClient))
135+
// NOTE: this is replaced by semconv.HTTPResponseStatusCode in semconv v1.21
136+
span.SetAttributes(semconv.HTTPStatusCode(statusCode))
137+
// NOTE: the conversion from HTTP status code to trace code is no longer available with
138+
// semconv v1.21
139+
span.SetStatus(httpconv.ServerStatus(statusCode))
136140
}
137141

138142
return reader.ReadResponse(response, consumer)

client/opentelemetry_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ func assertOpenTelemetrySubmit(t *testing.T, operation *runtime.ClientOperation,
122122
attribute.String("http.method", http.MethodGet),
123123
attribute.String("span.kind", trace.SpanKindClient.String()),
124124
attribute.String("http.scheme", "https"),
125+
// NOTE: this becomes http.response.status_code with semconv v1.21
125126
attribute.Int("http.status_code", 490),
126127
}, span.Attributes)
127128
}

go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ require (
1111
github.com/go-openapi/validate v0.22.3
1212
github.com/opentracing/opentracing-go v1.2.0
1313
github.com/stretchr/testify v1.8.4
14-
go.opentelemetry.io/otel v1.14.0
15-
go.opentelemetry.io/otel/sdk v1.14.0
16-
go.opentelemetry.io/otel/trace v1.14.0
14+
go.opentelemetry.io/otel v1.17.0
15+
go.opentelemetry.io/otel/sdk v1.17.0
16+
go.opentelemetry.io/otel/trace v1.17.0
1717
gopkg.in/yaml.v2 v2.4.0
1818
)
1919

@@ -30,7 +30,8 @@ require (
3030
github.com/oklog/ulid v1.3.1 // indirect
3131
github.com/pmezard/go-difflib v1.0.0 // indirect
3232
go.mongodb.org/mongo-driver v1.13.1 // indirect
33-
golang.org/x/sys v0.5.0 // indirect
33+
go.opentelemetry.io/otel/metric v1.17.0 // indirect
34+
golang.org/x/sys v0.14.0 // indirect
3435
gopkg.in/yaml.v3 v3.0.1 // indirect
3536
)
3637

go.sum

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,14 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
9696
go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8=
9797
go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk=
9898
go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo=
99-
go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
100-
go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
101-
go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY=
102-
go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM=
103-
go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
104-
go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
99+
go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM=
100+
go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0=
101+
go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc=
102+
go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o=
103+
go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE=
104+
go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ=
105+
go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ=
106+
go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY=
105107
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
106108
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
107109
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
@@ -119,8 +121,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
119121
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
120122
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
121123
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
122-
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
123-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
124+
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
125+
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
124126
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
125127
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
126128
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

0 commit comments

Comments
 (0)