Skip to content

Commit b5635a7

Browse files
author
Alex Boten
authored
remove workaround to ignore for errors when creating instruments (#8575)
The workaround had been put in place because of a restriction on `/` characters in the name of the instrument. This is no longer an issue. This PR fixes #8346 Follows #8574 --------- Signed-off-by: Alex Boten <[email protected]>
1 parent 465438f commit b5635a7

File tree

20 files changed

+34
-75
lines changed

20 files changed

+34
-75
lines changed

‎.chloggen/codeboten_rm-ignore-err.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: telemetry
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "remove workaround to ignore errors when an instrument includes a `/`"
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [8346]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

‎exporter/debugexporter/go.mod‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ require (
1313
require (
1414
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
1515
github.com/davecgh/go-spew v1.1.1 // indirect
16-
github.com/go-logr/logr v1.2.4 // indirect
17-
github.com/go-logr/stdr v1.2.2 // indirect
1816
github.com/gogo/protobuf v1.3.2 // indirect
1917
github.com/golang/protobuf v1.5.3 // indirect
2018
github.com/json-iterator/go v1.1.12 // indirect
@@ -35,8 +33,6 @@ require (
3533
go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 // indirect
3634
go.opentelemetry.io/otel v1.19.0 // indirect
3735
go.opentelemetry.io/otel/metric v1.19.0 // indirect
38-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
39-
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
4036
go.opentelemetry.io/otel/trace v1.19.0 // indirect
4137
go.uber.org/multierr v1.11.0 // indirect
4238
go.uber.org/zap v1.26.0 // indirect

‎exporter/debugexporter/go.sum‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
1717
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
1818
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
1919
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
20-
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
2120
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
22-
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
2321
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
24-
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
2522
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
2623
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
2724
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -102,9 +99,7 @@ go.opentelemetry.io/otel/exporters/prometheus v0.42.0 h1:jwV9iQdvp38fxXi8ZC+lNpx
10299
go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
103100
go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
104101
go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
105-
go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
106102
go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k=
107-
go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY=
108103
go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
109104
go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
110105
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=

‎exporter/exporterhelper/obsexporter.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ package exporterhelper // import "go.opentelemetry.io/collector/exporter/exporte
55

66
import (
77
"context"
8-
"errors"
98

109
"go.opencensus.io/stats"
1110
"go.opencensus.io/tag"
1211
"go.opentelemetry.io/otel/attribute"
1312
"go.opentelemetry.io/otel/codes"
1413
"go.opentelemetry.io/otel/metric"
15-
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
1614
"go.opentelemetry.io/otel/trace"
1715
"go.uber.org/multierr"
1816
"go.uber.org/zap"
@@ -71,11 +69,7 @@ func newExporter(cfg ObsReportSettings, useOtel bool) (*ObsReport, error) {
7169
},
7270
}
7371

74-
// ignore instrument name error as per workaround in https://github.com/open-telemetry/opentelemetry-collector/issues/8346
75-
// if err := exp.createOtelMetrics(cfg); err != nil {
76-
// return nil, err
77-
// }
78-
if err := exp.createOtelMetrics(cfg); err != nil && !errors.Is(err, sdkmetric.ErrInstrumentName) {
72+
if err := exp.createOtelMetrics(cfg); err != nil {
7973
return nil, err
8074
}
8175

‎exporter/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
go.opentelemetry.io/otel v1.19.0
1616
go.opentelemetry.io/otel/metric v1.19.0
1717
go.opentelemetry.io/otel/sdk v1.19.0
18-
go.opentelemetry.io/otel/sdk/metric v1.19.0
1918
go.opentelemetry.io/otel/trace v1.19.0
2019
go.uber.org/multierr v1.11.0
2120
go.uber.org/zap v1.26.0
@@ -53,6 +52,7 @@ require (
5352
go.opentelemetry.io/collector/confmap v0.86.0 // indirect
5453
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015 // indirect
5554
go.opentelemetry.io/otel/exporters/prometheus v0.42.0 // indirect
55+
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
5656
golang.org/x/net v0.15.0 // indirect
5757
golang.org/x/text v0.13.0 // indirect
5858
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎exporter/loggingexporter/go.mod‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ require (
1515
require (
1616
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
1717
github.com/davecgh/go-spew v1.1.1 // indirect
18-
github.com/go-logr/logr v1.2.4 // indirect
19-
github.com/go-logr/stdr v1.2.2 // indirect
2018
github.com/gogo/protobuf v1.3.2 // indirect
2119
github.com/golang/protobuf v1.5.3 // indirect
2220
github.com/json-iterator/go v1.1.12 // indirect
@@ -37,8 +35,6 @@ require (
3735
go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 // indirect
3836
go.opentelemetry.io/otel v1.19.0 // indirect
3937
go.opentelemetry.io/otel/metric v1.19.0 // indirect
40-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
41-
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
4238
go.opentelemetry.io/otel/trace v1.19.0 // indirect
4339
go.uber.org/multierr v1.11.0 // indirect
4440
golang.org/x/net v0.15.0 // indirect

‎exporter/loggingexporter/go.sum‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
1717
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
1818
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
1919
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
20-
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
2120
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
22-
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
2321
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
24-
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
2522
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
2623
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
2724
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -102,9 +99,7 @@ go.opentelemetry.io/otel/exporters/prometheus v0.42.0 h1:jwV9iQdvp38fxXi8ZC+lNpx
10299
go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
103100
go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
104101
go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
105-
go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
106102
go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k=
107-
go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY=
108103
go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
109104
go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
110105
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=

‎exporter/otlpexporter/go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ require (
5454
go.opentelemetry.io/otel v1.19.0 // indirect
5555
go.opentelemetry.io/otel/metric v1.19.0 // indirect
5656
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
57-
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
5857
go.opentelemetry.io/otel/trace v1.19.0 // indirect
5958
go.uber.org/multierr v1.11.0 // indirect
6059
go.uber.org/zap v1.26.0 // indirect

‎exporter/otlpexporter/go.sum‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319
120120
go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
121121
go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
122122
go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k=
123-
go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY=
124123
go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
125124
go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
126125
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=

‎exporter/otlphttpexporter/go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ require (
6060
go.opentelemetry.io/otel v1.19.0 // indirect
6161
go.opentelemetry.io/otel/metric v1.19.0 // indirect
6262
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
63-
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
6463
go.opentelemetry.io/otel/trace v1.19.0 // indirect
6564
go.uber.org/multierr v1.11.0 // indirect
6665
golang.org/x/net v0.15.0 // indirect

0 commit comments

Comments
 (0)