Skip to content

Commit fbcf39c

Browse files
MadVikingGodMrAlias
MadVikingGod
and
MrAlias
authored
Remove the use of metric/unit (#3509)
Co-authored-by: Tyler Yahn <[email protected]>
1 parent e054521 commit fbcf39c

File tree

19 files changed

+64
-68
lines changed

19 files changed

+64
-68
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ require (
99
github.com/prometheus/client_golang v1.14.0
1010
go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql v0.39.0
1111
go.opentelemetry.io/otel v1.13.0
12-
go.opentelemetry.io/otel/exporters/prometheus v0.36.0
12+
go.opentelemetry.io/otel/exporters/prometheus v0.36.1-0.20230227180222-b177f58e09ca
1313
go.opentelemetry.io/otel/exporters/zipkin v1.13.0
14-
go.opentelemetry.io/otel/metric v0.36.1-0.20230221193137-99ec432679fb
14+
go.opentelemetry.io/otel/metric v0.36.1-0.20230227180222-b177f58e09ca
1515
go.opentelemetry.io/otel/sdk v1.13.0
16-
go.opentelemetry.io/otel/sdk/metric v0.36.0
16+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230227180222-b177f58e09ca
1717
)
1818

1919
require (
@@ -30,7 +30,7 @@ require (
3030
github.com/prometheus/common v0.37.0 // indirect
3131
github.com/prometheus/procfs v0.8.0 // indirect
3232
go.opentelemetry.io/otel/trace v1.13.0 // indirect
33-
golang.org/x/sys v0.0.0-20221010170243-090e33056c14 // indirect
33+
golang.org/x/sys v0.5.0 // indirect
3434
google.golang.org/protobuf v1.28.1 // indirect
3535
gopkg.in/inf.v0 v0.9.1 // indirect
3636
)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,16 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
223223
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
224224
go.opentelemetry.io/otel v1.13.0 h1:1ZAKnNQKwBBxFtww/GwxNUyTf0AxkZzrukO8MeXqe4Y=
225225
go.opentelemetry.io/otel v1.13.0/go.mod h1:FH3RtdZCzRkJYFTCsAKDy9l/XYjMdNv6QrkFFB8DvVg=
226-
go.opentelemetry.io/otel/exporters/prometheus v0.36.0 h1:EbfJRxojnpb+ux8IO79oKHXu9jsbWjd00cT0XmbP5gU=
227-
go.opentelemetry.io/otel/exporters/prometheus v0.36.0/go.mod h1:gYHAjuEuMrtPXccEHyvYcQVC//c4QwgQcUq1/3mx7Ys=
226+
go.opentelemetry.io/otel/exporters/prometheus v0.36.1-0.20230227180222-b177f58e09ca h1:RSy1dz+HxjEi3tbcjfnFp2iGWP1rSK9SJL20sVcUkug=
227+
go.opentelemetry.io/otel/exporters/prometheus v0.36.1-0.20230227180222-b177f58e09ca/go.mod h1:iapmW6bs/5a5D9i84HxN9WzQQJyKYAZQh1MfU7vYyPA=
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.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=
230+
go.opentelemetry.io/otel/metric v0.36.1-0.20230227180222-b177f58e09ca h1:CwcAEsg8nESCD37XUTfM5rP2VajHicRWnA64cJF/vd0=
231+
go.opentelemetry.io/otel/metric v0.36.1-0.20230227180222-b177f58e09ca/go.mod h1:oCFgCINZEkradqd2yXqAXgYHRcPnxLoUfE7EENEZc4Y=
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=
234-
go.opentelemetry.io/otel/sdk/metric v0.36.0 h1:dEXpkkOAEcHiRiaZdvd63MouV+3bCtAB/bF3jlNKnr8=
235-
go.opentelemetry.io/otel/sdk/metric v0.36.0/go.mod h1:Lv4HQQPSCSkhyBKzLNtE8YhTSdK4HCwNh3lh7CiR20s=
234+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230227180222-b177f58e09ca h1:wCsK585aj6svi4TQwcK/nct1Pb+7ZDeMx8kPA3B5FEQ=
235+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230227180222-b177f58e09ca/go.mod h1:bQYuEFv5Uvodr03JQeHjaIGDyFlFJvJnReJc04M5cpw=
236236
go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY=
237237
go.opentelemetry.io/otel/trace v1.13.0/go.mod h1:muCvmmO9KKpvuXSf3KKAXXB2ygNYHQ+ZfI5X08d3tds=
238238
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -356,8 +356,8 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
356356
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
357357
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
358358
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
359-
golang.org/x/sys v0.0.0-20221010170243-090e33056c14 h1:k5II8e6QD8mITdi+okbbmR/cIyEbeXLBhy5Ha4nevyc=
360-
golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
359+
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
360+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
361361
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
362362
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
363363
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/gocql/gocql v1.3.1
77
github.com/stretchr/testify v1.8.2
88
go.opentelemetry.io/otel v1.13.0
9-
go.opentelemetry.io/otel/metric v0.36.0
9+
go.opentelemetry.io/otel/metric v0.36.1-0.20230227180222-b177f58e09ca
1010
go.opentelemetry.io/otel/trace v1.13.0
1111
)
1212

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ
3434
github.com/stretchr/testify v1.8.2/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.20230227180222-b177f58e09ca h1:CwcAEsg8nESCD37XUTfM5rP2VajHicRWnA64cJF/vd0=
38+
go.opentelemetry.io/otel/metric v0.36.1-0.20230227180222-b177f58e09ca/go.mod h1:oCFgCINZEkradqd2yXqAXgYHRcPnxLoUfE7EENEZc4Y=
3939
go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY=
4040
go.opentelemetry.io/otel/trace v1.13.0/go.mod h1:muCvmmO9KKpvuXSf3KKAXXB2ygNYHQ+ZfI5X08d3tds=
4141
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

‎instrumentation/github.com/gocql/gocql/otelgocql/instrument.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql/internal"
2121
"go.opentelemetry.io/otel/metric"
2222
"go.opentelemetry.io/otel/metric/instrument"
23-
"go.opentelemetry.io/otel/metric/unit"
2423
)
2524

2625
type instruments struct {
@@ -82,7 +81,7 @@ func newInstruments(p metric.MeterProvider) *instruments {
8281
if instruments.latency, err = meter.Int64Histogram(
8382
"db.cassandra.latency",
8483
instrument.WithDescription("Sum of latency to host in milliseconds"),
85-
instrument.WithUnit(unit.Milliseconds),
84+
instrument.WithUnit("ms"),
8685
); err != nil {
8786
log.Printf("failed to create iLatency instrument, %v", err)
8887
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ 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.1-0.20230221193137-99ec432679fb
1211
go.opentelemetry.io/otel/sdk v1.13.0
13-
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230221193137-99ec432679fb
12+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230227180222-b177f58e09ca
1413
go.opentelemetry.io/otel/trace v1.13.0
1514
)
1615

@@ -21,7 +20,8 @@ require (
2120
github.com/golang/snappy v0.0.3 // indirect
2221
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
2322
github.com/pmezard/go-difflib v1.0.0 // indirect
24-
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
23+
go.opentelemetry.io/otel/metric v0.36.1-0.20230227180222-b177f58e09ca // indirect
24+
golang.org/x/sys v0.5.0 // indirect
2525
gopkg.in/inf.v0 v0.9.1 // indirect
2626
gopkg.in/yaml.v3 v3.0.1 // indirect
2727
)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ
3434
github.com/stretchr/testify v1.8.2/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.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=
37+
go.opentelemetry.io/otel/metric v0.36.1-0.20230227180222-b177f58e09ca h1:CwcAEsg8nESCD37XUTfM5rP2VajHicRWnA64cJF/vd0=
38+
go.opentelemetry.io/otel/metric v0.36.1-0.20230227180222-b177f58e09ca/go.mod h1:oCFgCINZEkradqd2yXqAXgYHRcPnxLoUfE7EENEZc4Y=
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.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=
41+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230227180222-b177f58e09ca h1:wCsK585aj6svi4TQwcK/nct1Pb+7ZDeMx8kPA3B5FEQ=
42+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230227180222-b177f58e09ca/go.mod h1:bQYuEFv5Uvodr03JQeHjaIGDyFlFJvJnReJc04M5cpw=
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=
45-
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
46-
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
45+
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
46+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4747
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4848
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4949
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql/internal"
3131
"go.opentelemetry.io/contrib/internal/util"
3232
"go.opentelemetry.io/otel/attribute"
33-
"go.opentelemetry.io/otel/metric/unit"
3433
"go.opentelemetry.io/otel/sdk/instrumentation"
3534
"go.opentelemetry.io/otel/sdk/metric"
3635
"go.opentelemetry.io/otel/sdk/metric/metricdata"
@@ -360,7 +359,7 @@ func assertRowsMetric(t *testing.T, count uint64, m metricdata.Metrics) {
360359
func assertLatencyMetric(t *testing.T, count uint64, m metricdata.Metrics) {
361360
assert.Equal(t, "db.cassandra.latency", m.Name)
362361
assert.Equal(t, "Sum of latency to host in milliseconds", m.Description)
363-
assert.Equal(t, unit.Milliseconds, m.Unit)
362+
assert.Equal(t, "ms", m.Unit)
364363
require.IsType(t, m.Data, metricdata.Histogram{})
365364
data := m.Data.(metricdata.Histogram)
366365
assert.Equal(t, metricdata.CumulativeTemporality, data.Temporality, "Temporality")

‎instrumentation/google.golang.org/grpc/otelgrpc/config.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"go.opentelemetry.io/otel/metric"
2121
"go.opentelemetry.io/otel/metric/global"
2222
"go.opentelemetry.io/otel/metric/instrument"
23-
"go.opentelemetry.io/otel/metric/unit"
2423
"go.opentelemetry.io/otel/propagation"
2524
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
2625
"go.opentelemetry.io/otel/trace"
@@ -71,7 +70,7 @@ func newConfig(opts []Option) *config {
7170
metric.WithSchemaURL(semconv.SchemaURL),
7271
)
7372
var err error
74-
if c.rpcServerDuration, err = c.meter.Int64Histogram("rpc.server.duration", instrument.WithUnit(unit.Milliseconds)); err != nil {
73+
if c.rpcServerDuration, err = c.meter.Int64Histogram("rpc.server.duration", instrument.WithUnit("ms")); err != nil {
7574
otel.Handle(err)
7675
}
7776

‎instrumentation/host/example/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
go.opentelemetry.io/otel v1.13.0
1010
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.36.0
1111
go.opentelemetry.io/otel/sdk v1.13.0
12-
go.opentelemetry.io/otel/sdk/metric v0.36.0
12+
go.opentelemetry.io/otel/sdk/metric v0.36.1-0.20230227180222-b177f58e09ca
1313
)
1414

1515
require (
@@ -22,7 +22,7 @@ require (
2222
github.com/tklauser/go-sysconf v0.3.11 // indirect
2323
github.com/tklauser/numcpus v0.6.0 // indirect
2424
github.com/yusufpapurcu/wmi v1.2.2 // indirect
25-
go.opentelemetry.io/otel/metric v0.36.0 // indirect
25+
go.opentelemetry.io/otel/metric v0.36.1-0.20230227180222-b177f58e09ca // indirect
2626
go.opentelemetry.io/otel/trace v1.13.0 // indirect
27-
golang.org/x/sys v0.4.0 // indirect
27+
golang.org/x/sys v0.5.0 // indirect
2828
)

0 commit comments

Comments
 (0)