Skip to content

Commit

Permalink
remove opencensus bridge support
Browse files Browse the repository at this point in the history 
This removes the configuration of the OpenCensus bridge from the Collector. This
means that any metric still relying on it will no longer be emitting metrics.

This is blocked until open-telemetry/opentelemetry-collector-contrib#29867 is completed.

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
@codeboten
codeboten committed Jul 31, 2024
1 parent 6d32c09 commit 2a32de5
Show file tree
Hide file tree
Showing 12 changed files with 3 additions and 381 deletions.
2 changes: 0 additions & 2 deletions cmd/otelcorecol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ require (
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
Expand Down Expand Up @@ -108,7 +107,6 @@ require (
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
go.opentelemetry.io/contrib/zpages v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
Expand Down
79 changes: 0 additions & 79 deletions cmd/otelcorecol/go.sum
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions otelcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ require (
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
Expand Down Expand Up @@ -74,7 +73,6 @@ require (
go.opentelemetry.io/contrib/config v0.8.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
Expand Down
79 changes: 0 additions & 79 deletions otelcol/go.sum
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions otelcol/otelcoltest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ require (
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
Expand Down Expand Up @@ -74,7 +73,6 @@ require (
go.opentelemetry.io/contrib/config v0.8.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/bridge/opencensus v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
Expand Down
79 changes: 0 additions & 79 deletions otelcol/otelcoltest/go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion service/generated_package_test.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions service/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ require (
go.opentelemetry.io/contrib/config v0.8.0
go.opentelemetry.io/contrib/propagators/b3 v1.28.0
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel/bridge/opencensus v1.28.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0
go.opentelemetry.io/otel/exporters/prometheus v0.50.0
Expand All @@ -58,7 +57,6 @@ require (
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
Expand Down
79 changes: 0 additions & 79 deletions service/go.sum
View file

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions service/internal/proctelemetry/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ func InitMetricReader(ctx context.Context, reader config.MetricReader, asyncErro
}
if reader.Periodic != nil {
var opts []sdkmetric.PeriodicReaderOption

if !globalgates.DisableOpenCensusBridge.IsEnabled() {
opts = append(opts, sdkmetric.WithProducer(opencensus.NewMetricProducer()))
}
if reader.Periodic.Interval != nil {
opts = append(opts, sdkmetric.WithInterval(time.Duration(*reader.Periodic.Interval)*time.Millisecond))
}
Expand Down
2 changes: 0 additions & 2 deletions service/metadata.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ tests:
goleak:
ignore:
top:
# See https://github.com/census-instrumentation/opencensus-go/issues/1191 for more information.
- "go.opencensus.io/stats/view.(*worker).start"
- "go.opentelemetry.io/collector/service/internal/proctelemetry.InitPrometheusServer.func1"

telemetry:
Expand Down
52 changes: 2 additions & 50 deletions service/telemetry_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import (
io_prometheus_client "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
"github.com/stretchr/testify/require"
"go.opencensus.io/stats"
"go.opencensus.io/stats/view"
"go.opentelemetry.io/contrib/config"
"go.opentelemetry.io/otel/metric"

Expand All @@ -31,7 +29,6 @@ import (
const (
metricPrefix = "otelcol_"
otelPrefix = "otel_sdk_"
ocPrefix = "oc_sdk_"
grpcPrefix = "gprc_"
httpPrefix = "http_"
counterName = "test_counter"
Expand All @@ -54,14 +51,6 @@ func TestTelemetryInit(t *testing.T) {
{
name: "UseOpenTelemetryForInternalMetrics",
expectedMetrics: map[string]metricValue{
metricPrefix + ocPrefix + counterName: {
value: 13,
labels: map[string]string{
"service_name": "otelcol",
"service_version": "latest",
"service_instance_id": testInstanceID,
},
},
metricPrefix + otelPrefix + counterName: {
value: 13,
labels: map[string]string{
Expand Down Expand Up @@ -105,14 +94,6 @@ func TestTelemetryInit(t *testing.T) {
name: "DisableHighCardinalityWithOtel",
disableHighCard: true,
expectedMetrics: map[string]metricValue{
metricPrefix + ocPrefix + counterName: {
value: 13,
labels: map[string]string{
"service_name": "otelcol",
"service_version": "latest",
"service_instance_id": testInstanceID,
},
},
metricPrefix + otelPrefix + counterName: {
value: 13,
labels: map[string]string{
Expand Down Expand Up @@ -170,14 +151,6 @@ func TestTelemetryInit(t *testing.T) {
},
},
expectedMetrics: map[string]metricValue{
metricPrefix + ocPrefix + counterName: {
value: 13,
labels: map[string]string{
"service_name": "otelcol",
"service_version": "latest",
"service_instance_id": testInstanceID,
},
},
metricPrefix + otelPrefix + counterName: {
value: 13,
labels: map[string]string{
Expand Down Expand Up @@ -301,10 +274,7 @@ func TestTelemetryInit(t *testing.T) {
}
}()

v := createTestMetrics(t, mp)
defer func() {
view.Unregister(v)
}()
createTestMetrics(t, mp)

metrics := getMetricsFromPrometheus(t, mp.(*meterProvider).servers[0].Handler)
require.Equal(t, len(tc.expectedMetrics), len(metrics))
Expand All @@ -327,7 +297,7 @@ func TestTelemetryInit(t *testing.T) {
}
}

func createTestMetrics(t *testing.T, mp metric.MeterProvider) *view.View {
func createTestMetrics(t *testing.T, mp metric.MeterProvider) {
// Creates a OTel Go counter
counter, err := mp.Meter("collector_test").Int64Counter(metricPrefix+otelPrefix+counterName, metric.WithUnit("ms"))
require.NoError(t, err)
Expand All @@ -340,24 +310,6 @@ func createTestMetrics(t *testing.T, mp metric.MeterProvider) *view.View {
httpExampleCounter, err := mp.Meter(proctelemetry.HTTPInstrumentation).Int64Counter(metricPrefix + httpPrefix + counterName)
require.NoError(t, err)
httpExampleCounter.Add(context.Background(), 10, metric.WithAttributes(proctelemetry.HTTPUnacceptableKeyValues...))

// Creates a OpenCensus measure
ocCounter := stats.Int64(metricPrefix+ocPrefix+counterName, counterName, stats.UnitDimensionless)
v := &view.View{
Name: metricPrefix + ocPrefix + counterName,
Description: ocCounter.Description(),
Measure: ocCounter,
Aggregation: view.Sum(),
}
err = view.Register(v)
require.NoError(t, err)

stats.Record(context.Background(), stats.Int64(metricPrefix+ocPrefix+counterName, counterName, stats.UnitDimensionless).M(13))

// Forces a flush for the view data.
_, _ = view.RetrieveData(metricPrefix + ocPrefix + counterName)

return v
}

func getMetricsFromPrometheus(t *testing.T, handler http.Handler) map[string]*io_prometheus_client.MetricFamily {
Expand Down

0 comments on commit 2a32de5

Please sign in to comment.