Skip to content

Commit d9b1211

Browse files
MadVikingGodMadVikingGod
authored
Update use of metric Reader.Collect() (#3426)
* Update collect calls. * Update go mods to newest collect method.
1 parent e915b7c commit d9b1211

File tree

11 files changed

+31
-26
lines changed

11 files changed

+31
-26
lines changed

‎instrumentation/github.com/gocql/gocql/otelgocql/example/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
go.opentelemetry.io/otel v1.13.0
1212
go.opentelemetry.io/otel/exporters/prometheus v0.36.0
1313
go.opentelemetry.io/otel/exporters/zipkin v1.13.0
14-
go.opentelemetry.io/otel/metric v0.36.0
14+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb
1515
go.opentelemetry.io/otel/sdk v1.13.0
1616
go.opentelemetry.io/otel/sdk/metric v0.36.0
1717
)

‎instrumentation/github.com/gocql/gocql/otelgocql/example/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ go.opentelemetry.io/otel/exporters/prometheus v0.36.0 h1:EbfJRxojnpb+ux8IO79oKHX
227227
go.opentelemetry.io/otel/exporters/prometheus v0.36.0/go.mod h1:gYHAjuEuMrtPXccEHyvYcQVC//c4QwgQcUq1/3mx7Ys=
228228
go.opentelemetry.io/otel/exporters/zipkin v1.13.0 h1:RqPV1VhJjrx28qOKYFPj3Mso56uaBovur3GZehF9y9s=
229229
go.opentelemetry.io/otel/exporters/zipkin v1.13.0/go.mod h1:x6S2VkXmdpoYUqQx9FKiMEsndal6xkcwDdV0Oi1RlLM=
230-
go.opentelemetry.io/otel/metric v0.36.0 h1:t0lgGI+L68QWt3QtOIlqM9gXoxqxWLhZ3R/e5oOAY0Q=
231-
go.opentelemetry.io/otel/metric v0.36.0/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
230+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb h1:ERlouo+/B1ERdSHUNYj1s4zT+zp2gg2J4/f69tbdio0=
231+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
232232
go.opentelemetry.io/otel/sdk v1.13.0 h1:BHib5g8MvdqS65yo2vV1s6Le42Hm6rrw08qU6yz5JaM=
233233
go.opentelemetry.io/otel/sdk v1.13.0/go.mod h1:YLKPx5+6Vx/o1TCUYYs+bpymtkmazOMT6zoRrC7AQ7I=
234234
go.opentelemetry.io/otel/sdk/metric v0.36.0 h1:dEXpkkOAEcHiRiaZdvd63MouV+3bCtAB/bF3jlNKnr8=

‎instrumentation/github.com/gocql/gocql/otelgocql/test/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ require (
88
go.opentelemetry.io/contrib v1.14.0
99
go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql v0.39.0
1010
go.opentelemetry.io/otel v1.13.0
11-
go.opentelemetry.io/otel/metric v0.36.0
11+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb
1212
go.opentelemetry.io/otel/sdk v1.13.0
13-
go.opentelemetry.io/otel/sdk/metric v0.36.0
13+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb
1414
go.opentelemetry.io/otel/trace v1.13.0
1515
)
1616

‎instrumentation/github.com/gocql/gocql/otelgocql/test/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
3434
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
3535
go.opentelemetry.io/otel v1.13.0 h1:1ZAKnNQKwBBxFtww/GwxNUyTf0AxkZzrukO8MeXqe4Y=
3636
go.opentelemetry.io/otel v1.13.0/go.mod h1:FH3RtdZCzRkJYFTCsAKDy9l/XYjMdNv6QrkFFB8DvVg=
37-
go.opentelemetry.io/otel/metric v0.36.0 h1:t0lgGI+L68QWt3QtOIlqM9gXoxqxWLhZ3R/e5oOAY0Q=
38-
go.opentelemetry.io/otel/metric v0.36.0/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
37+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb h1:ERlouo+/B1ERdSHUNYj1s4zT+zp2gg2J4/f69tbdio0=
38+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
3939
go.opentelemetry.io/otel/sdk v1.13.0 h1:BHib5g8MvdqS65yo2vV1s6Le42Hm6rrw08qU6yz5JaM=
4040
go.opentelemetry.io/otel/sdk v1.13.0/go.mod h1:YLKPx5+6Vx/o1TCUYYs+bpymtkmazOMT6zoRrC7AQ7I=
41-
go.opentelemetry.io/otel/sdk/metric v0.36.0 h1:dEXpkkOAEcHiRiaZdvd63MouV+3bCtAB/bF3jlNKnr8=
42-
go.opentelemetry.io/otel/sdk/metric v0.36.0/go.mod h1:Lv4HQQPSCSkhyBKzLNtE8YhTSdK4HCwNh3lh7CiR20s=
41+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb h1:/BUwS+4dNdmMI/ucDWKfR8GYnv+Wfh7po5v0kNI+jdI=
42+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb/go.mod h1:Lv4HQQPSCSkhyBKzLNtE8YhTSdK4HCwNh3lh7CiR20s=
4343
go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY=
4444
go.opentelemetry.io/otel/trace v1.13.0/go.mod h1:muCvmmO9KKpvuXSf3KKAXXB2ygNYHQ+ZfI5X08d3tds=
4545
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=

‎instrumentation/github.com/gocql/gocql/otelgocql/test/gocql_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ func TestQuery(t *testing.T) {
104104
assertConnectionLevelAttributes(t, span)
105105
}
106106

107-
rm, err := reader.Collect(context.Background())
107+
rm := metricdata.ResourceMetrics{}
108+
err = reader.Collect(context.Background(), &rm)
108109
require.NoError(t, err)
109110
require.Len(t, rm.ScopeMetrics, 1)
110111
sm := rm.ScopeMetrics[0]
@@ -159,7 +160,8 @@ func TestBatch(t *testing.T) {
159160
assertConnectionLevelAttributes(t, span)
160161
}
161162

162-
rm, err := reader.Collect(context.Background())
163+
rm := metricdata.ResourceMetrics{}
164+
err = reader.Collect(context.Background(), &rm)
163165
require.NoError(t, err)
164166
require.Len(t, rm.ScopeMetrics, 1)
165167
sm := rm.ScopeMetrics[0]
@@ -200,7 +202,8 @@ func TestConnection(t *testing.T) {
200202
assertConnectionLevelAttributes(t, span)
201203
}
202204

203-
rm, err := reader.Collect(context.Background())
205+
rm := metricdata.ResourceMetrics{}
206+
err = reader.Collect(context.Background(), &rm)
204207
require.NoError(t, err)
205208
require.Len(t, rm.ScopeMetrics, 1)
206209
sm := rm.ScopeMetrics[0]

‎instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.39.0
88
go.opentelemetry.io/otel v1.13.0
99
go.opentelemetry.io/otel/sdk v1.13.0
10-
go.opentelemetry.io/otel/sdk/metric v0.36.0
10+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb
1111
go.uber.org/goleak v1.2.1
1212
google.golang.org/grpc v1.53.0
1313
)
@@ -21,7 +21,7 @@ require (
2121
github.com/golang/protobuf v1.5.2 // indirect
2222
github.com/kr/text v0.2.0 // indirect
2323
github.com/pmezard/go-difflib v1.0.0 // indirect
24-
go.opentelemetry.io/otel/metric v0.36.0 // indirect
24+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb // indirect
2525
go.opentelemetry.io/otel/trace v1.13.0 // indirect
2626
golang.org/x/net v0.7.0 // indirect
2727
golang.org/x/oauth2 v0.4.0 // indirect

‎instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
3131
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
3232
go.opentelemetry.io/otel v1.13.0 h1:1ZAKnNQKwBBxFtww/GwxNUyTf0AxkZzrukO8MeXqe4Y=
3333
go.opentelemetry.io/otel v1.13.0/go.mod h1:FH3RtdZCzRkJYFTCsAKDy9l/XYjMdNv6QrkFFB8DvVg=
34-
go.opentelemetry.io/otel/metric v0.36.0 h1:t0lgGI+L68QWt3QtOIlqM9gXoxqxWLhZ3R/e5oOAY0Q=
35-
go.opentelemetry.io/otel/metric v0.36.0/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
34+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb h1:ERlouo+/B1ERdSHUNYj1s4zT+zp2gg2J4/f69tbdio0=
35+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
3636
go.opentelemetry.io/otel/sdk v1.13.0 h1:BHib5g8MvdqS65yo2vV1s6Le42Hm6rrw08qU6yz5JaM=
3737
go.opentelemetry.io/otel/sdk v1.13.0/go.mod h1:YLKPx5+6Vx/o1TCUYYs+bpymtkmazOMT6zoRrC7AQ7I=
38-
go.opentelemetry.io/otel/sdk/metric v0.36.0 h1:dEXpkkOAEcHiRiaZdvd63MouV+3bCtAB/bF3jlNKnr8=
39-
go.opentelemetry.io/otel/sdk/metric v0.36.0/go.mod h1:Lv4HQQPSCSkhyBKzLNtE8YhTSdK4HCwNh3lh7CiR20s=
38+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb h1:/BUwS+4dNdmMI/ucDWKfR8GYnv+Wfh7po5v0kNI+jdI=
39+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb/go.mod h1:Lv4HQQPSCSkhyBKzLNtE8YhTSdK4HCwNh3lh7CiR20s=
4040
go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY=
4141
go.opentelemetry.io/otel/trace v1.13.0/go.mod h1:muCvmmO9KKpvuXSf3KKAXXB2ygNYHQ+ZfI5X08d3tds=
4242
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=

‎instrumentation/google.golang.org/grpc/otelgrpc/test/grpc_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,8 @@ func assertEvents(t *testing.T, expected, actual []trace.Event) bool {
586586
}
587587

588588
func checkUnaryServerRecords(t *testing.T, reader metric.Reader) {
589-
rm, err := reader.Collect(context.Background())
589+
rm := metricdata.ResourceMetrics{}
590+
err := reader.Collect(context.Background(), &rm)
590591
assert.NoError(t, err)
591592
require.Len(t, rm.ScopeMetrics, 1)
592593
require.Len(t, rm.ScopeMetrics[0].Metrics, 1)

‎instrumentation/net/http/otelhttp/test/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0
88
go.opentelemetry.io/otel v1.13.0
99
go.opentelemetry.io/otel/sdk v1.13.0
10-
go.opentelemetry.io/otel/sdk/metric v0.36.0
10+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb
1111
go.opentelemetry.io/otel/trace v1.13.0
1212
)
1313

@@ -17,7 +17,7 @@ require (
1717
github.com/go-logr/logr v1.2.3 // indirect
1818
github.com/go-logr/stdr v1.2.2 // indirect
1919
github.com/pmezard/go-difflib v1.0.0 // indirect
20-
go.opentelemetry.io/otel/metric v0.36.0 // indirect
20+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb // indirect
2121
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
2222
gopkg.in/yaml.v3 v3.0.1 // indirect
2323
)

‎instrumentation/net/http/otelhttp/test/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
2020
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
2121
go.opentelemetry.io/otel v1.13.0 h1:1ZAKnNQKwBBxFtww/GwxNUyTf0AxkZzrukO8MeXqe4Y=
2222
go.opentelemetry.io/otel v1.13.0/go.mod h1:FH3RtdZCzRkJYFTCsAKDy9l/XYjMdNv6QrkFFB8DvVg=
23-
go.opentelemetry.io/otel/metric v0.36.0 h1:t0lgGI+L68QWt3QtOIlqM9gXoxqxWLhZ3R/e5oOAY0Q=
24-
go.opentelemetry.io/otel/metric v0.36.0/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
23+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb h1:ERlouo+/B1ERdSHUNYj1s4zT+zp2gg2J4/f69tbdio0=
24+
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
2525
go.opentelemetry.io/otel/sdk v1.13.0 h1:BHib5g8MvdqS65yo2vV1s6Le42Hm6rrw08qU6yz5JaM=
2626
go.opentelemetry.io/otel/sdk v1.13.0/go.mod h1:YLKPx5+6Vx/o1TCUYYs+bpymtkmazOMT6zoRrC7AQ7I=
27-
go.opentelemetry.io/otel/sdk/metric v0.36.0 h1:dEXpkkOAEcHiRiaZdvd63MouV+3bCtAB/bF3jlNKnr8=
28-
go.opentelemetry.io/otel/sdk/metric v0.36.0/go.mod h1:Lv4HQQPSCSkhyBKzLNtE8YhTSdK4HCwNh3lh7CiR20s=
27+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb h1:/BUwS+4dNdmMI/ucDWKfR8GYnv+Wfh7po5v0kNI+jdI=
28+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb/go.mod h1:Lv4HQQPSCSkhyBKzLNtE8YhTSdK4HCwNh3lh7CiR20s=
2929
go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY=
3030
go.opentelemetry.io/otel/trace v1.13.0/go.mod h1:muCvmmO9KKpvuXSf3KKAXXB2ygNYHQ+ZfI5X08d3tds=
3131
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=

0 commit comments

Comments
 (0)