Skip to content

Commit 041e3f6

Browse files
committed
merging feature gate in telemetry
Signed-off-by: Andreas Gkizas <[email protected]>
1 parent 3267177 commit 041e3f6

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

cmd/otelcorecol/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ require (
100100
go.opentelemetry.io/collector/connector/connectortest v0.132.0 // indirect
101101
go.opentelemetry.io/collector/connector/xconnector v0.132.0 // indirect
102102
go.opentelemetry.io/collector/consumer v1.38.0 // indirect
103-
go.opentelemetry.io/collector/consumer/consumererror v0.132.0 // indirect
103+
go.opentelemetry.io/collector/consumer/consumererror v1.38.0 // indirect
104104
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.132.0 // indirect
105105
go.opentelemetry.io/collector/consumer/consumertest v0.132.0 // indirect
106106
go.opentelemetry.io/collector/consumer/xconsumer v0.132.0 // indirect

internal/e2e/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ require (
103103
go.opentelemetry.io/collector/config/configmiddleware v0.132.0 // indirect
104104
go.opentelemetry.io/collector/confmap/xconfmap v0.132.0 // indirect
105105
go.opentelemetry.io/collector/connector/xconnector v0.132.0 // indirect
106-
go.opentelemetry.io/collector/consumer/consumererror v0.132.0 // indirect
106+
go.opentelemetry.io/collector/consumer/consumererror v1.38.0 // indirect
107107
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.132.0 // indirect
108108
go.opentelemetry.io/collector/consumer/xconsumer v0.132.0 // indirect
109109
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.132.0 // indirect

receiver/receiverhelper/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ require (
77
go.opentelemetry.io/collector/component v1.38.0
88
go.opentelemetry.io/collector/component/componenttest v0.132.0
99
go.opentelemetry.io/collector/consumer/consumererror v1.38.0
10+
go.opentelemetry.io/collector/featuregate v1.38.0
11+
go.opentelemetry.io/collector/internal/telemetry v0.132.0
1012
go.opentelemetry.io/collector/pipeline v1.38.0
1113
go.opentelemetry.io/collector/receiver v1.38.0
1214
go.opentelemetry.io/otel v1.37.0
@@ -29,8 +31,6 @@ require (
2931
github.com/pmezard/go-difflib v1.0.0 // indirect
3032
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
3133
go.opentelemetry.io/collector/consumer v1.38.0 // indirect
32-
go.opentelemetry.io/collector/featuregate v1.38.0 // indirect
33-
go.opentelemetry.io/collector/internal/telemetry v0.132.0 // indirect
3434
go.opentelemetry.io/collector/pdata v1.38.0 // indirect
3535
go.opentelemetry.io/collector/pdata/pprofile v0.132.0 // indirect
3636
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect

scraper/scraperhelper/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
3838
github.com/pmezard/go-difflib v1.0.0 // indirect
3939
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
40-
go.opentelemetry.io/collector/consumer/consumererror v0.132.0 // indirect
40+
go.opentelemetry.io/collector/consumer/consumererror v1.38.0 // indirect
4141
go.opentelemetry.io/collector/consumer/xconsumer v0.132.0 // indirect
4242
go.opentelemetry.io/collector/featuregate v1.38.0 // indirect
4343
go.opentelemetry.io/collector/internal/telemetry v0.132.0 // indirect

service/internal/obsconsumer/logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var (
2020
)
2121

2222
func NewLogs(cons consumer.Logs, itemCounter, sizeCounter metric.Int64Counter, opts ...Option) consumer.Logs {
23-
if !telemetry.DistinguishDownstreamErrors.IsEnabled() || !telemetry.NewPipelineTelemetryGate.IsEnabled() {
23+
if !telemetry.NewPipelineTelemetryGate.IsEnabled() {
2424
return cons
2525
}
2626

service/internal/obsconsumer/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var (
2020
)
2121

2222
func NewMetrics(cons consumer.Metrics, itemCounter, sizeCounter metric.Int64Counter, opts ...Option) consumer.Metrics {
23-
if !telemetry.DistinguishDownstreamErrors.IsEnabled() || !telemetry.NewPipelineTelemetryGate.IsEnabled() {
23+
if !telemetry.NewPipelineTelemetryGate.IsEnabled() {
2424
return cons
2525
}
2626

service/internal/obsconsumer/traces.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var (
2020
)
2121

2222
func NewTraces(cons consumer.Traces, itemCounter, sizeCounter metric.Int64Counter, opts ...Option) consumer.Traces {
23-
if !telemetry.DistinguishDownstreamErrors.IsEnabled() || !telemetry.NewPipelineTelemetryGate.IsEnabled() {
23+
if !telemetry.NewPipelineTelemetryGate.IsEnabled() {
2424
return cons
2525
}
2626

0 commit comments

Comments
 (0)