Skip to content

Commit e456b9b

Browse files
ggreenwayphlax
andauthored
opencensus: delete opencensus tracer (#37508)
Additional Description: This has been deprecated for several releases, and the upstream dependency is no longer maintained. Risk Level: Low; this was marked as deprecated in 1.28 and was supposed to be removed in 1.30 Fixes #9958 Progress on #11816 --------- Signed-off-by: Greg Greenway <[email protected]> Co-authored-by: Ryan Northey <[email protected]>
1 parent ecbcdab commit e456b9b

File tree

44 files changed

+11
-1886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+11
-1886
lines changed

CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ extensions/filters/http/oauth2 @derekargueta @mattklein123
280280
# tracers
281281
/*/extensions/tracers/zipkin @wbpcode @Shikugawa @basvanbeek
282282
/*/extensions/tracers/dynamic_ot @wbpcode @Shikugawa @basvanbeek
283-
/*/extensions/tracers/opencensus @wbpcode @Shikugawa @basvanbeek
284283
/*/extensions/tracers/common @wbpcode @Shikugawa @basvanbeek
285284
/*/extensions/tracers/common/ot @wbpcode @Shikugawa @basvanbeek
286285
# ext_authz

api/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ proto_library(
373373
"//envoy/service/secret/v3:pkg",
374374
"//envoy/service/status/v3:pkg",
375375
"//envoy/service/tap/v3:pkg",
376-
"//envoy/service/trace/v3:pkg",
377376
"//envoy/type/http/v3:pkg",
378377
"//envoy/type/matcher/v3:pkg",
379378
"//envoy/type/metadata/v3:pkg",

api/bazel/external_proto_deps.bzl

-6
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ EXTERNAL_PROTO_IMPORT_BAZEL_DEP_MAP = {
1212
"google/api/expr/v1alpha1/checked.proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto",
1313
"google/api/expr/v1alpha1/syntax.proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto",
1414
"io/prometheus/client/metrics.proto": "@prometheus_metrics_model//:client_model",
15-
"opencensus/proto/trace/v1/trace.proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto",
16-
"opencensus/proto/trace/v1/trace_config.proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto",
1715
"opentelemetry/proto/common/v1/common.proto": "@opentelemetry_proto//:common",
1816
}
1917

@@ -30,8 +28,6 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = {
3028
# go_googleapis in https://github.com/bazelbuild/rules_go/blob/master/go/dependencies.rst#overriding-dependencies
3129
"@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1",
3230
"@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1",
33-
"@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_go",
34-
"@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go",
3531
"@opentelemetry_proto//:trace": "@opentelemetry_proto//:trace_go_proto",
3632
"@opentelemetry_proto//:logs": "@opentelemetry_proto//:logs_go_proto",
3733
"@opentelemetry_proto//:metrics": "@opentelemetry_proto//:metrics_go_proto",
@@ -42,8 +38,6 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = {
4238
EXTERNAL_PROTO_CC_BAZEL_DEP_MAP = {
4339
"@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto",
4440
"@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
45-
"@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_cc",
46-
"@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto_cc",
4741
"@opentelemetry_proto//:trace": "@opentelemetry_proto//:trace_cc_proto",
4842
"@opentelemetry_proto//:logs": "@opentelemetry_proto//:logs_cc_proto",
4943
"@opentelemetry_proto//:metrics": "@opentelemetry_proto//:metrics_cc_proto",

api/bazel/repositories.bzl

-23
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ def api_dependencies():
3636
name = "prometheus_metrics_model",
3737
build_file_content = PROMETHEUSMETRICS_BUILD_CONTENT,
3838
)
39-
external_http_archive(
40-
name = "opencensus_proto",
41-
)
4239
external_http_archive(
4340
name = "rules_proto",
4441
)
@@ -85,26 +82,6 @@ go_proto_library(
8582
)
8683
"""
8784

88-
OPENCENSUSTRACE_BUILD_CONTENT = """
89-
load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library")
90-
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
91-
92-
api_cc_py_proto_library(
93-
name = "trace_model",
94-
srcs = [
95-
"trace.proto",
96-
],
97-
visibility = ["//visibility:public"],
98-
)
99-
100-
go_proto_library(
101-
name = "trace_model_go_proto",
102-
importpath = "trace_model",
103-
proto = ":trace_model",
104-
visibility = ["//visibility:public"],
105-
)
106-
"""
107-
10885
ZIPKINAPI_BUILD_CONTENT = """
10986
11087
load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library")

api/bazel/repository_locations.bzl

-13
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,6 @@ REPOSITORY_LOCATIONS_SPEC = dict(
8888
license = "Apache-2.0",
8989
license_url = "https://github.com/googleapis/googleapis/blob/{version}/LICENSE",
9090
),
91-
opencensus_proto = dict(
92-
project_name = "OpenCensus Proto",
93-
project_desc = "Language Independent Interface Types For OpenCensus",
94-
project_url = "https://github.com/census-instrumentation/opencensus-proto",
95-
version = "0.4.1",
96-
sha256 = "e3d89f7f9ed84c9b6eee818c2e9306950519402bf803698b15c310b77ca2f0f3",
97-
release_date = "2022-09-23",
98-
strip_prefix = "opencensus-proto-{version}/src",
99-
urls = ["https://github.com/census-instrumentation/opencensus-proto/archive/v{version}.tar.gz"],
100-
use_category = ["api"],
101-
license = "Apache-2.0",
102-
license_url = "https://github.com/census-instrumentation/opencensus-proto/blob/v{version}/LICENSE",
103-
),
10491
prometheus_metrics_model = dict(
10592
project_name = "Prometheus client model",
10693
project_desc = "Data model artifacts for Prometheus",

api/buf.lock

-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ deps:
1717
owner: googleapis
1818
repository: googleapis
1919
commit: 62f35d8aed1149c291d606d958a7ce32
20-
- remote: buf.build
21-
owner: opencensus
22-
repository: opencensus
23-
commit: bc2645b085534e4f8ebae3ef20088165
2420
- remote: buf.build
2521
owner: opentelemetry
2622
repository: opentelemetry

api/buf.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
version: v1
22
deps:
33
- buf.build/googleapis/googleapis:62f35d8aed1149c291d606d958a7ce32
4-
- buf.build/opencensus/opencensus
54
- buf.build/prometheus/client-model
65
- buf.build/opentelemetry/opentelemetry
76
- buf.build/gogo/protobuf

api/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.proto

-8
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,6 @@ message HttpConnectionManager {
163163

164164
// Configuration for an external tracing provider.
165165
// If not specified, no tracing will be performed.
166-
//
167-
// .. attention::
168-
// Please be aware that *envoy.tracers.opencensus* provider can only be configured once
169-
// in Envoy lifetime.
170-
// Any attempts to reconfigure it or to use different configurations for different HCM filters
171-
// will be rejected.
172-
// Such a constraint is inherent to OpenCensus itself. It cannot be overcome without changes
173-
// on OpenCensus side.
174166
trace.v2.Tracing.Http provider = 9;
175167
}
176168

api/envoy/config/trace/v2/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ api_proto_package(
99
"//envoy/annotations:pkg",
1010
"//envoy/api/v2/core:pkg",
1111
"@com_github_cncf_xds//udpa/annotations:pkg",
12-
"@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto",
1312
],
1413
)

api/envoy/config/trace/v2/http_tracer.proto

-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ message Tracing {
4141
// - *envoy.tracers.zipkin*
4242
// - *envoy.tracers.dynamic_ot*
4343
// - *envoy.tracers.datadog*
44-
// - *envoy.tracers.opencensus*
4544
// - *envoy.tracers.xray*
4645
string name = 1 [(validate.rules).string = {min_bytes: 1}];
4746

@@ -52,7 +51,6 @@ message Tracing {
5251
// - :ref:`ZipkinConfig <envoy_api_msg_config.trace.v2.ZipkinConfig>`
5352
// - :ref:`DynamicOtConfig <envoy_api_msg_config.trace.v2.DynamicOtConfig>`
5453
// - :ref:`DatadogConfig <envoy_api_msg_config.trace.v2.DatadogConfig>`
55-
// - :ref:`OpenCensusConfig <envoy_api_msg_config.trace.v2.OpenCensusConfig>`
5654
// - :ref:`AWS X-Ray <envoy_api_msg_config.trace.v2alpha.XRayConfig>`
5755
oneof config_type {
5856
google.protobuf.Struct config = 2 [deprecated = true];

api/envoy/config/trace/v2/opencensus.proto

-93
This file was deleted.

api/envoy/config/trace/v2/trace.proto

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import public "envoy/config/trace/v2/datadog.proto";
66
import public "envoy/config/trace/v2/dynamic_ot.proto";
77
import public "envoy/config/trace/v2/http_tracer.proto";
88
import public "envoy/config/trace/v2/lightstep.proto";
9-
import public "envoy/config/trace/v2/opencensus.proto";
109
import public "envoy/config/trace/v2/service.proto";
1110
import public "envoy/config/trace/v2/zipkin.proto";
1211

api/envoy/config/trace/v3/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ api_proto_package(
99
"//envoy/annotations:pkg",
1010
"//envoy/config/core/v3:pkg",
1111
"@com_github_cncf_xds//udpa/annotations:pkg",
12-
"@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto",
1312
],
1413
)

0 commit comments

Comments
 (0)