Skip to content

Commit 50e80b0

Browse files
lrascaolrascao
authored
Update OTEL dependencies to latest release candidates (#620)
* Update OTEL dependencies to latest release candidates go.opentelemetry.io/otel v1.15.1/v0.38.1 go.opentelemetry.io/contrib v1.16.0/v0.41.0 go.opentelemetry.io/collector v1.0.0/v0.76.1 Signed-off-by: Luis Rascao <luis.rascao@gmail.com> * fixup! Update OTEL dependencies to latest release candidates * fixup! Update OTEL dependencies to latest release candidates * fixup! Update OTEL dependencies to latest release candidates * fixup! Update OTEL dependencies to latest release candidates --------- Signed-off-by: Luis Rascao <luis.rascao@gmail.com>
1 parent b1305d7 commit 50e80b0

30 files changed

Lines changed: 407 additions & 407 deletions

File tree

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@ gotidy:
185185
update-dep:
186186
$(MAKE) for-all-mod CMD="$(PWD)/internal/buildscripts/update-dep"
187187

188-
STABLE_OTEL_VERSION=v1.14.0
189-
UNSTABLE_OTEL_VERSION=v0.37.0
190-
STABLE_CONTRIB_OTEL_VERSION=v1.15.0
191-
UNSTABLE_CONTRIB_OTEL_VERSION=v0.40.0
192-
STABLE_COLLECTOR_VERSION=v1.0.0-rc7
193-
UNSTABLE_COLLECTOR_VERSION=v0.73.0
194-
UNSTABLE_COLLECTOR_CONTRIB_VERSION=v0.73.0
188+
STABLE_OTEL_VERSION=v1.15.1
189+
UNSTABLE_OTEL_VERSION=v0.38.1
190+
STABLE_CONTRIB_OTEL_VERSION=v1.16.0
191+
UNSTABLE_CONTRIB_OTEL_VERSION=v0.41.0
192+
STABLE_COLLECTOR_VERSION=v1.0.0-rcv0011
193+
UNSTABLE_COLLECTOR_VERSION=v0.77.0
194+
UNSTABLE_COLLECTOR_CONTRIB_VERSION=v0.77.0
195195

196196
.PHONY: update-otel
197197
update-otel:

‎e2e-test-server/cloud_functions/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ require (
1717
cloud.google.com/go/iam v0.8.0 // indirect
1818
cloud.google.com/go/trace v1.8.0 // indirect
1919
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.13.1 // indirect
20-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.13.1 // indirect
20+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v0.0.0-00010101000000-000000000000 // indirect
2121
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.37.1 // indirect
22-
github.com/go-logr/logr v1.2.3 // indirect
22+
github.com/go-logr/logr v1.2.4 // indirect
2323
github.com/go-logr/stdr v1.2.2 // indirect
2424
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2525
github.com/golang/protobuf v1.5.2 // indirect
@@ -31,17 +31,17 @@ require (
3131
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
3232
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
3333
go.opencensus.io v0.24.0 // indirect
34-
go.opentelemetry.io/contrib/detectors/gcp v1.15.0 // indirect
35-
go.opentelemetry.io/otel v1.14.0 // indirect
36-
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
37-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
34+
go.opentelemetry.io/contrib/detectors/gcp v1.16.0 // indirect
35+
go.opentelemetry.io/otel v1.15.1 // indirect
36+
go.opentelemetry.io/otel/sdk v1.15.1 // indirect
37+
go.opentelemetry.io/otel/trace v1.15.1 // indirect
3838
go.uber.org/atomic v1.10.0 // indirect
3939
go.uber.org/multierr v1.8.0 // indirect
4040
go.uber.org/zap v1.10.0 // indirect
4141
golang.org/x/net v0.7.0 // indirect
4242
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
4343
golang.org/x/sync v0.1.0 // indirect
44-
golang.org/x/sys v0.5.0 // indirect
44+
golang.org/x/sys v0.7.0 // indirect
4545
golang.org/x/text v0.7.0 // indirect
4646
google.golang.org/api v0.108.0 // indirect
4747
google.golang.org/appengine v1.6.7 // indirect

‎e2e-test-server/cloud_functions/go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
9797
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
9898
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
9999
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
100-
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
101-
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
100+
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
101+
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
102102
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
103103
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
104104
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -237,14 +237,14 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
237237
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
238238
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
239239
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
240-
go.opentelemetry.io/contrib/detectors/gcp v1.15.0 h1:eeqxk68BbnIKEvHiLbs0oW83Q/LCUJ/iUAuN9wKr8xA=
241-
go.opentelemetry.io/contrib/detectors/gcp v1.15.0/go.mod h1:VYYKLxQ30A4BaChRUXVwoJ7uQLmoLw/MYY+CwJJQ1U0=
242-
go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
243-
go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
244-
go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY=
245-
go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM=
246-
go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
247-
go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
240+
go.opentelemetry.io/contrib/detectors/gcp v1.16.0 h1:h3kTBc5zu4VtnugxV9pITXtDTtUsxwd1Mom2X3I4y+Y=
241+
go.opentelemetry.io/contrib/detectors/gcp v1.16.0/go.mod h1:4e5HcVB/0bVNxOCB8ikvd2IfCM9VQT0FBxCfhsp93IY=
242+
go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8=
243+
go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc=
244+
go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI=
245+
go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA=
246+
go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY=
247+
go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8=
248248
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
249249
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
250250
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -407,8 +407,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
407407
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
408408
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
409409
golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
410-
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
411-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
410+
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
411+
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
412412
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
413413
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
414414
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎e2e-test-server/go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ go 1.20
44

55
require (
66
cloud.google.com/go/pubsub v1.27.1
7-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.13.1
8-
go.opentelemetry.io/contrib/detectors/gcp v1.15.0
9-
go.opentelemetry.io/otel v1.14.0
10-
go.opentelemetry.io/otel/sdk v1.14.0
11-
go.opentelemetry.io/otel/trace v1.14.0
7+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v0.0.0-00010101000000-000000000000
8+
go.opentelemetry.io/contrib/detectors/gcp v1.16.0
9+
go.opentelemetry.io/otel v1.15.1
10+
go.opentelemetry.io/otel/sdk v1.15.1
11+
go.opentelemetry.io/otel/trace v1.15.1
1212
google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa
1313
)
1414

@@ -20,7 +20,7 @@ require (
2020
cloud.google.com/go/trace v1.8.0 // indirect
2121
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.13.1 // indirect
2222
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.37.1 // indirect
23-
github.com/go-logr/logr v1.2.3 // indirect
23+
github.com/go-logr/logr v1.2.4 // indirect
2424
github.com/go-logr/stdr v1.2.2 // indirect
2525
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2626
github.com/golang/protobuf v1.5.2 // indirect
@@ -33,7 +33,7 @@ require (
3333
golang.org/x/net v0.7.0 // indirect
3434
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
3535
golang.org/x/sync v0.1.0 // indirect
36-
golang.org/x/sys v0.5.0 // indirect
36+
golang.org/x/sys v0.7.0 // indirect
3737
golang.org/x/text v0.7.0 // indirect
3838
google.golang.org/api v0.108.0 // indirect
3939
google.golang.org/appengine v1.6.7 // indirect

‎e2e-test-server/go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
2727
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
2828
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
2929
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
30-
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
31-
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
30+
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
31+
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
3232
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
3333
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
3434
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -77,14 +77,14 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
7777
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
7878
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
7979
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
80-
go.opentelemetry.io/contrib/detectors/gcp v1.15.0 h1:eeqxk68BbnIKEvHiLbs0oW83Q/LCUJ/iUAuN9wKr8xA=
81-
go.opentelemetry.io/contrib/detectors/gcp v1.15.0/go.mod h1:VYYKLxQ30A4BaChRUXVwoJ7uQLmoLw/MYY+CwJJQ1U0=
82-
go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
83-
go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
84-
go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY=
85-
go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM=
86-
go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
87-
go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
80+
go.opentelemetry.io/contrib/detectors/gcp v1.16.0 h1:h3kTBc5zu4VtnugxV9pITXtDTtUsxwd1Mom2X3I4y+Y=
81+
go.opentelemetry.io/contrib/detectors/gcp v1.16.0/go.mod h1:4e5HcVB/0bVNxOCB8ikvd2IfCM9VQT0FBxCfhsp93IY=
82+
go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8=
83+
go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc=
84+
go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI=
85+
go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA=
86+
go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY=
87+
go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8=
8888
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
8989
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
9090
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
@@ -117,8 +117,8 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
117117
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
118118
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
119119
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
120-
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
121-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
120+
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
121+
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
122122
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
123123
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
124124
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

‎example/metric/example.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func main() {
8181
log.Fatalf("Failed to create counter: %v", err)
8282
}
8383
clabels := []attribute.KeyValue{attribute.Key("key").String("value")}
84-
counter.Add(ctx, 100, clabels...)
84+
counter.Add(ctx, 100, metric.WithAttributes(clabels...))
8585

8686
histogram, err := meter.Float64Histogram("histogram-b")
8787
if err != nil {
@@ -101,7 +101,7 @@ func main() {
101101
}
102102
_, err = meter.RegisterCallback(func(ctx context.Context, o metric.Observer) error {
103103
v := of.get()
104-
o.ObserveFloat64(gaugeObserver, v, olabels...)
104+
o.ObserveFloat64(gaugeObserver, v, metric.WithAttributes(olabels...))
105105
return nil
106106
}, gaugeObserver)
107107
if err != nil {
@@ -114,11 +114,11 @@ func main() {
114114
for range timer.C {
115115
r := rng.Int63n(100)
116116
cv := 100 + r
117-
counter.Add(ctx, cv, clabels...)
117+
counter.Add(ctx, cv, metric.WithAttributes(clabels...))
118118

119119
r2 := rng.Int63n(100)
120120
hv := float64(r2) / 20.0
121-
histogram.Record(ctx, hv, clabels...)
121+
histogram.Record(ctx, hv, metric.WithAttributes(clabels...))
122122
ov := 12.34 + hv
123123
of.set(ov)
124124
log.Printf("Most recent data: counter %v, observer %v; histogram %v", cv, ov, hv)

‎example/metric/go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,32 @@ module github.com/GoogleCloudPlatform/opentelemetry-operations-go/example/metric
33
go 1.20
44

55
require (
6-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.37.1
7-
go.opentelemetry.io/otel v1.14.0
8-
go.opentelemetry.io/otel/metric v0.37.0
9-
go.opentelemetry.io/otel/sdk/metric v0.37.0
6+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.0.0-00010101000000-000000000000
7+
go.opentelemetry.io/otel v1.15.1
8+
go.opentelemetry.io/otel/metric v0.38.1
9+
go.opentelemetry.io/otel/sdk/metric v0.38.1
1010
)
1111

1212
require (
1313
cloud.google.com/go/compute v1.14.0 // indirect
1414
cloud.google.com/go/compute/metadata v0.2.3 // indirect
1515
cloud.google.com/go/monitoring v1.12.0 // indirect
1616
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.37.1 // indirect
17-
github.com/go-logr/logr v1.2.3 // indirect
17+
github.com/go-logr/logr v1.2.4 // indirect
1818
github.com/go-logr/stdr v1.2.2 // indirect
1919
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2020
github.com/golang/protobuf v1.5.2 // indirect
2121
github.com/google/go-cmp v0.5.9 // indirect
2222
github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
2323
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
2424
go.opencensus.io v0.24.0 // indirect
25-
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
26-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
25+
go.opentelemetry.io/otel/sdk v1.15.1 // indirect
26+
go.opentelemetry.io/otel/trace v1.15.1 // indirect
2727
go.uber.org/atomic v1.10.0 // indirect
2828
go.uber.org/multierr v1.8.0 // indirect
2929
golang.org/x/net v0.7.0 // indirect
3030
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
31-
golang.org/x/sys v0.5.0 // indirect
31+
golang.org/x/sys v0.7.0 // indirect
3232
golang.org/x/text v0.7.0 // indirect
3333
google.golang.org/api v0.107.0 // indirect
3434
google.golang.org/appengine v1.6.7 // indirect

‎example/metric/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
2121
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
2222
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
2323
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
24-
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
25-
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
24+
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
25+
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
2626
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
2727
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
2828
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -71,16 +71,16 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
7171
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
7272
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
7373
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
74-
go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
75-
go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
76-
go.opentelemetry.io/otel/metric v0.37.0 h1:pHDQuLQOZwYD+Km0eb657A25NaRzy0a+eLyKfDXedEs=
77-
go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s=
78-
go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY=
79-
go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM=
80-
go.opentelemetry.io/otel/sdk/metric v0.37.0 h1:haYBBtZZxiI3ROwSmkZnI+d0+AVzBWeviuYQDeBWosU=
81-
go.opentelemetry.io/otel/sdk/metric v0.37.0/go.mod h1:mO2WV1AZKKwhwHTV3AKOoIEb9LbUaENZDuGUQd+j4A0=
82-
go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
83-
go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
74+
go.opentelemetry.io/otel v1.15.1 h1:3Iwq3lfRByPaws0f6bU3naAqOR1n5IeDWd9390kWHa8=
75+
go.opentelemetry.io/otel v1.15.1/go.mod h1:mHHGEHVDLal6YrKMmk9LqC4a3sF5g+fHfrttQIB1NTc=
76+
go.opentelemetry.io/otel/metric v0.38.1 h1:2MM7m6wPw9B8Qv8iHygoAgkbejed59uUR6ezR5T3X2s=
77+
go.opentelemetry.io/otel/metric v0.38.1/go.mod h1:FwqNHD3I/5iX9pfrRGZIlYICrJv0rHEUl2Ln5vdIVnQ=
78+
go.opentelemetry.io/otel/sdk v1.15.1 h1:5FKR+skgpzvhPQHIEfcwMYjCBr14LWzs3uSqKiQzETI=
79+
go.opentelemetry.io/otel/sdk v1.15.1/go.mod h1:8rVtxQfrbmbHKfqzpQkT5EzZMcbMBwTzNAggbEAM0KA=
80+
go.opentelemetry.io/otel/sdk/metric v0.38.1 h1:EkO5wI4NT/fUaoPMGc0fKV28JaWe7q4vfVpEVasGb+8=
81+
go.opentelemetry.io/otel/sdk/metric v0.38.1/go.mod h1:Rn4kSXFF9ZQZ5lL1pxQjCbK4seiO+U7s0ncmIFJaj34=
82+
go.opentelemetry.io/otel/trace v1.15.1 h1:uXLo6iHJEzDfrNC0L0mNjItIp06SyaBQxu5t3xMlngY=
83+
go.opentelemetry.io/otel/trace v1.15.1/go.mod h1:IWdQG/5N1x7f6YUlmdLeJvH9yxtuJAfc4VW5Agv9r/8=
8484
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
8585
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
8686
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
@@ -111,8 +111,8 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
111111
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
112112
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
113113
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
114-
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
115-
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
114+
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
115+
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
116116
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
117117
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
118118
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

0 commit comments

Comments
 (0)