Skip to content

Commit 9832be9

Browse files
hugoaguirrehugoaguirre
authored
chore(go): update all dependencies to their latest versions (#2825)
1 parent 41a9718 commit 9832be9

File tree

7 files changed

+284
-266
lines changed

7 files changed

+284
-266
lines changed

‎go/core/tracing/store.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ type Data struct {
3131
// SpanData can be passed to json.Marshal, whereas most of the OpenTelemetry
3232
// types make no claims about JSON serializability.
3333
type SpanData struct {
34-
SpanID string `json:"spanId"`
35-
TraceID string `json:"traceId,omitempty"`
36-
ParentSpanID string `json:"parentSpanId,omitempty"`
37-
StartTime Milliseconds `json:"startTime"`
38-
EndTime Milliseconds `json:"endTime"`
39-
Attributes map[string]any `json:"attributes,omitempty"`
40-
DisplayName string `json:"displayName"`
41-
Links []*Link `json:"links,omitempty"`
42-
InstrumentationLibrary InstrumentationLibrary `json:"instrumentationLibrary,omitempty"`
43-
SpanKind string `json:"spanKind"` // trace.SpanKind as a string
34+
SpanID string `json:"spanId"`
35+
TraceID string `json:"traceId,omitempty"`
36+
ParentSpanID string `json:"parentSpanId,omitempty"`
37+
StartTime Milliseconds `json:"startTime"`
38+
EndTime Milliseconds `json:"endTime"`
39+
Attributes map[string]any `json:"attributes,omitempty"`
40+
DisplayName string `json:"displayName"`
41+
Links []*Link `json:"links,omitempty"`
42+
InstrumentationScope InstrumentationScope `json:"instrumentationLibrary,omitempty"` // TODO: update json tag when JS runtime gets updated
43+
SpanKind string `json:"spanKind"` // trace.SpanKind as a string
4444
// This bool is in a separate struct, to match the js (and presumably the OTel) formats.
4545
SameProcessAsParentSpan BoolValue `json:"sameProcessAsParentSpan"`
4646
Status Status `json:"status"`
@@ -80,9 +80,9 @@ type Link struct {
8080
DroppedAttributesCount int `json:"droppedAttributesCount"`
8181
}
8282

83-
// InstrumentationLibrary is a copy of [go.opentelemetry.io/otel/sdk/instrumentation.Library],
83+
// InstrumentationScope is a copy of [go.opentelemetry.io/otel/sdk/instrumentation.Library],
8484
// with added struct tags to match the javascript JSON field names.
85-
type InstrumentationLibrary struct {
85+
type InstrumentationScope struct {
8686
Name string `json:"name"`
8787
Version string `json:"version"`
8888
SchemaURL string `json:"schemaUrl,omitempty"`

‎go/core/tracing/trace_server_exporter.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"strings"
2424

2525
"go.opentelemetry.io/otel/attribute"
26+
"go.opentelemetry.io/otel/sdk/instrumentation"
2627
sdktrace "go.opentelemetry.io/otel/sdk/trace"
2728
otrace "go.opentelemetry.io/otel/trace"
2829
)
@@ -102,7 +103,7 @@ func convertSpan(span sdktrace.ReadOnlySpan) *SpanData {
102103
Attributes: attributesToMap(span.Attributes()),
103104
DisplayName: span.Name(),
104105
Links: convertLinks(span.Links()),
105-
InstrumentationLibrary: InstrumentationLibrary(span.InstrumentationLibrary()),
106+
InstrumentationScope: convertScope(span.InstrumentationScope()),
106107
SpanKind: strings.ToUpper(span.SpanKind().String()),
107108
SameProcessAsParentSpan: BoolValue{!sc.IsRemote()},
108109
Status: convertStatus(span.Status()),
@@ -124,6 +125,15 @@ func attributesToMap(attrs []attribute.KeyValue) map[string]any {
124125
return m
125126
}
126127

128+
// convertScope converts an OpenTelemetry InstrumentationScope to an InstrumentationScope
129+
func convertScope(s instrumentation.Scope) InstrumentationScope {
130+
return InstrumentationScope{
131+
Name: s.Name,
132+
Version: s.Version,
133+
SchemaURL: s.SchemaURL,
134+
}
135+
}
136+
127137
func convertLinks(links []sdktrace.Link) []*Link {
128138
var cls []*Link
129139
for _, l := range links {

‎go/core/tracing/trace_server_exporter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestConvertSpan(t *testing.T) {
7979
Code: codes.Ok,
8080
Description: "desc",
8181
},
82-
InstrumentationLibrary: instrumentation.Library{
82+
InstrumentationScope: instrumentation.Scope{
8383
Name: "iname",
8484
Version: "version",
8585
SchemaURL: "surl",
@@ -112,7 +112,7 @@ func TestConvertSpan(t *testing.T) {
112112
DroppedAttributesCount: 1,
113113
}},
114114
Status: Status{Code: 2, Description: "desc"},
115-
InstrumentationLibrary: InstrumentationLibrary{
115+
InstrumentationScope: InstrumentationScope{
116116
Name: "iname",
117117
Version: "version",
118118
SchemaURL: "surl",

‎go/go.mod

Lines changed: 70 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -8,101 +8,112 @@ retract (
88
)
99

1010
require (
11-
cloud.google.com/go/firestore v1.16.0
12-
cloud.google.com/go/logging v1.11.0
13-
firebase.google.com/go/v4 v4.14.1
14-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.46.0
15-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.22.0
11+
cloud.google.com/go/firestore v1.18.0
12+
cloud.google.com/go/logging v1.13.0
13+
firebase.google.com/go/v4 v4.15.2
14+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0
15+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.27.0
1616
github.com/anthropics/anthropic-sdk-go v0.2.0-beta.3
1717
github.com/blues/jsonata-go v1.5.4
18-
github.com/google/dotprompt/go v0.0.0-20250415074656-072d95deb01d
18+
github.com/google/dotprompt/go v0.0.0-20250424065700-61c578cf43ac
1919
github.com/google/go-cmp v0.7.0
2020
github.com/google/uuid v1.6.0
2121
github.com/invopop/jsonschema v0.13.0
2222
github.com/jba/slog v0.2.0
2323
github.com/lib/pq v1.10.9
2424
github.com/pgvector/pgvector-go v0.3.0
25-
github.com/weaviate/weaviate v1.26.0-rc.1
26-
github.com/weaviate/weaviate-go-client/v4 v4.15.0
25+
github.com/weaviate/weaviate v1.30.1
26+
github.com/weaviate/weaviate-go-client/v5 v5.1.0
2727
github.com/xeipuuv/gojsonschema v1.2.0
28-
go.opentelemetry.io/otel v1.29.0
29-
go.opentelemetry.io/otel/metric v1.29.0
30-
go.opentelemetry.io/otel/sdk v1.29.0
31-
go.opentelemetry.io/otel/sdk/metric v1.29.0
32-
go.opentelemetry.io/otel/trace v1.29.0
33-
golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81
34-
golang.org/x/tools v0.31.0
35-
google.golang.org/api v0.197.0
36-
google.golang.org/genai v1.1.0
28+
go.opentelemetry.io/otel v1.35.0
29+
go.opentelemetry.io/otel/metric v1.35.0
30+
go.opentelemetry.io/otel/sdk v1.35.0
31+
go.opentelemetry.io/otel/sdk/metric v1.35.0
32+
go.opentelemetry.io/otel/trace v1.35.0
33+
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
34+
golang.org/x/tools v0.32.0
35+
google.golang.org/api v0.230.0
36+
google.golang.org/genai v1.2.0
3737
gopkg.in/yaml.v2 v2.4.0
3838
gopkg.in/yaml.v3 v3.0.1
3939
)
4040

4141
require (
42-
cloud.google.com/go v0.116.0 // indirect
43-
cloud.google.com/go/auth v0.9.3 // indirect
44-
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
45-
cloud.google.com/go/compute/metadata v0.5.0 // indirect
46-
cloud.google.com/go/iam v1.2.0 // indirect
47-
cloud.google.com/go/longrunning v0.6.0 // indirect
48-
cloud.google.com/go/monitoring v1.21.0 // indirect
49-
cloud.google.com/go/storage v1.43.0 // indirect
50-
cloud.google.com/go/trace v1.11.0 // indirect
51-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.46.0 // indirect
42+
cel.dev/expr v0.23.1 // indirect
43+
cloud.google.com/go v0.120.1 // indirect
44+
cloud.google.com/go/auth v0.16.1 // indirect
45+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
46+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
47+
cloud.google.com/go/iam v1.5.2 // indirect
48+
cloud.google.com/go/longrunning v0.6.7 // indirect
49+
cloud.google.com/go/monitoring v1.24.2 // indirect
50+
cloud.google.com/go/storage v1.52.0 // indirect
51+
cloud.google.com/go/trace v1.11.6 // indirect
52+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
53+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
5254
github.com/MicahParks/keyfunc v1.9.0 // indirect
53-
github.com/PuerkitoBio/purell v1.1.1 // indirect
54-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
5555
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5656
github.com/bahlo/generic-list-go v0.2.0 // indirect
5757
github.com/buger/jsonparser v1.1.1 // indirect
58+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
59+
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
60+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
61+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
5862
github.com/felixge/httpsnoop v1.0.4 // indirect
63+
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
5964
github.com/go-logr/logr v1.4.2 // indirect
6065
github.com/go-logr/stdr v1.2.2 // indirect
61-
github.com/go-openapi/analysis v0.21.2 // indirect
62-
github.com/go-openapi/errors v0.22.0 // indirect
63-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
64-
github.com/go-openapi/jsonreference v0.19.6 // indirect
65-
github.com/go-openapi/loads v0.21.1 // indirect
66-
github.com/go-openapi/spec v0.20.4 // indirect
66+
github.com/go-openapi/analysis v0.23.0 // indirect
67+
github.com/go-openapi/errors v0.22.1 // indirect
68+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
69+
github.com/go-openapi/jsonreference v0.21.0 // indirect
70+
github.com/go-openapi/loads v0.22.0 // indirect
71+
github.com/go-openapi/runtime v0.24.2 // indirect
72+
github.com/go-openapi/spec v0.21.0 // indirect
6773
github.com/go-openapi/strfmt v0.23.0 // indirect
68-
github.com/go-openapi/swag v0.22.3 // indirect
69-
github.com/go-openapi/validate v0.21.0 // indirect
74+
github.com/go-openapi/swag v0.23.1 // indirect
75+
github.com/go-openapi/validate v0.24.0 // indirect
7076
github.com/goccy/go-yaml v1.17.1 // indirect
7177
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
72-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
78+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
7379
github.com/golang/protobuf v1.5.4 // indirect
74-
github.com/google/s2a-go v0.1.8 // indirect
75-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
76-
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
80+
github.com/google/s2a-go v0.1.9 // indirect
81+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
82+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
7783
github.com/gorilla/websocket v1.5.3 // indirect
7884
github.com/josharian/intern v1.0.0 // indirect
7985
github.com/mailru/easyjson v0.9.0 // indirect
8086
github.com/mbleigh/raymond v0.0.0-20250414171441-6b3a58ab9e0a // indirect
8187
github.com/mitchellh/mapstructure v1.5.0 // indirect
8288
github.com/oklog/ulid v1.3.1 // indirect
89+
github.com/opentracing/opentracing-go v1.2.0 // indirect
8390
github.com/pkg/errors v0.9.1 // indirect
84-
github.com/tidwall/gjson v1.14.4 // indirect
91+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
92+
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
93+
github.com/tidwall/gjson v1.18.0 // indirect
8594
github.com/tidwall/match v1.1.1 // indirect
8695
github.com/tidwall/pretty v1.2.1 // indirect
8796
github.com/tidwall/sjson v1.2.5 // indirect
8897
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
8998
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
9099
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
91-
go.mongodb.org/mongo-driver v1.14.0 // indirect
92-
go.opencensus.io v0.24.0 // indirect
93-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
94-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
95-
golang.org/x/crypto v0.36.0 // indirect
96-
golang.org/x/net v0.38.0 // indirect
97-
golang.org/x/oauth2 v0.23.0 // indirect
98-
golang.org/x/sync v0.12.0 // indirect
99-
golang.org/x/sys v0.31.0 // indirect
100-
golang.org/x/text v0.23.0 // indirect
101-
golang.org/x/time v0.6.0 // indirect
102-
google.golang.org/appengine/v2 v2.0.2 // indirect
103-
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
104-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
105-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
106-
google.golang.org/grpc v1.66.2 // indirect
107-
google.golang.org/protobuf v1.34.2 // indirect
100+
github.com/zeebo/errs v1.4.0 // indirect
101+
go.mongodb.org/mongo-driver v1.17.3 // indirect
102+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
103+
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
104+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
105+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
106+
golang.org/x/crypto v0.37.0 // indirect
107+
golang.org/x/net v0.39.0 // indirect
108+
golang.org/x/oauth2 v0.29.0 // indirect
109+
golang.org/x/sync v0.13.0 // indirect
110+
golang.org/x/sys v0.32.0 // indirect
111+
golang.org/x/text v0.24.0 // indirect
112+
golang.org/x/time v0.11.0 // indirect
113+
google.golang.org/appengine/v2 v2.0.6 // indirect
114+
google.golang.org/genproto v0.0.0-20250422160041-2d3770c4ea7f // indirect
115+
google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f // indirect
116+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
117+
google.golang.org/grpc v1.72.0 // indirect
118+
google.golang.org/protobuf v1.36.6 // indirect
108119
)

0 commit comments

Comments
 (0)