Skip to content

Commit 417ea5e

Browse files
authored
Remove opencensus from config.yaml and config.yaml.go.tmpl for GBOC (#413)
1 parent d9c0431 commit 417ea5e

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

components/google-built-opentelemetry-collector/internal/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2121
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
2222
github.com/spf13/cobra v1.10.1 // indirect
23-
github.com/spf13/pflag v1.0.9 // indirect
23+
github.com/spf13/pflag v1.0.10 // indirect
2424
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
2525
go.opentelemetry.io/collector/cmd/mdatagen v0.134.0 // indirect
2626
go.opentelemetry.io/collector/component v1.40.0 // indirect

components/google-built-opentelemetry-collector/internal/tools/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
6363
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
6464
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
6565
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
66+
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
67+
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
6668
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
6769
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
6870
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

google-built-opentelemetry-collector/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33
#
44
# This file is the same as what is provided in the upstream otelcol and otelcol-contrib distribution container.
5-
# https://github.com/open-telemetry/opentelemetry-collector-releases/blob/6722b0720b1249fde53c819b423db9e797a7c0b6/distributions/otelcol/config.yaml
5+
# https://github.com/open-telemetry/opentelemetry-collector-releases/blob/8e11cfc9f1e0bd78e6a26140849c357ab3f0e4db/distributions/otelcol/config.yaml
66
#
77
# To limit exposure to denial of service attacks, change the host in endpoints below from 0.0.0.0 to a specific network interface.
88
# See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks
@@ -74,4 +74,4 @@ service:
7474
processors: [batch]
7575
exporters: [debug]
7676

77-
extensions: [health_check, pprof, zpages]
77+
extensions: [health_check, pprof, zpages]

templates/google-built-opentelemetry-collector/config.yaml.go.tmpl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ receivers:
2222
http:
2323
endpoint: 0.0.0.0:4318
2424

25-
opencensus:
26-
endpoint: 0.0.0.0:55678
27-
2825
# Collect own metrics
2926
prometheus:
3027
config:
@@ -60,12 +57,12 @@ service:
6057
pipelines:
6158

6259
traces:
63-
receivers: [otlp, opencensus, jaeger, zipkin]
60+
receivers: [otlp, jaeger, zipkin]
6461
processors: [batch]
6562
exporters: [debug]
6663

6764
metrics:
68-
receivers: [otlp, opencensus, prometheus]
65+
receivers: [otlp, prometheus]
6966
processors: [batch]
7067
exporters: [debug]
7168

@@ -74,4 +71,4 @@ service:
7471
processors: [batch]
7572
exporters: [debug]
7673

77-
extensions: [health_check, pprof, zpages]
74+
extensions: [health_check, pprof, zpages]

0 commit comments

Comments
 (0)