Skip to content

Commit

Permalink
Delete protos to remove dependency on opencensus protos (deprecated)
Browse files Browse the repository at this point in the history
Fixes envoyproxy/go-control-plane#1014

Signed-off-by: Greg Greenway <[email protected]>
  • Loading branch information
ggreenway committed Dec 4, 2024
1 parent 5a4dde3 commit 3731fb5
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 178 deletions.
1 change: 0 additions & 1 deletion api/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ proto_library(
"//envoy/service/secret/v3:pkg",
"//envoy/service/status/v3:pkg",
"//envoy/service/tap/v3:pkg",
"//envoy/service/trace/v3:pkg",
"//envoy/type/http/v3:pkg",
"//envoy/type/matcher/v3:pkg",
"//envoy/type/metadata/v3:pkg",
Expand Down
6 changes: 0 additions & 6 deletions api/bazel/external_proto_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ EXTERNAL_PROTO_IMPORT_BAZEL_DEP_MAP = {
"google/api/expr/v1alpha1/checked.proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_proto",
"google/api/expr/v1alpha1/syntax.proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto",
"io/prometheus/client/metrics.proto": "@prometheus_metrics_model//:client_model",
"opencensus/proto/trace/v1/trace.proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto",
"opencensus/proto/trace/v1/trace_config.proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto",
"opentelemetry/proto/common/v1/common.proto": "@opentelemetry_proto//:common",
}

Expand All @@ -30,8 +28,6 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = {
# go_googleapis in https://github.com/bazelbuild/rules_go/blob/master/go/dependencies.rst#overriding-dependencies
"@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1",
"@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@org_golang_google_genproto_googleapis_api//expr/v1alpha1",
"@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_go",
"@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_and_config_proto_go",
"@opentelemetry_proto//:trace": "@opentelemetry_proto//:trace_go_proto",
"@opentelemetry_proto//:logs": "@opentelemetry_proto//:logs_go_proto",
"@opentelemetry_proto//:metrics": "@opentelemetry_proto//:metrics_go_proto",
Expand All @@ -42,8 +38,6 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = {
EXTERNAL_PROTO_CC_BAZEL_DEP_MAP = {
"@com_google_googleapis//google/api/expr/v1alpha1:checked_proto": "@com_google_googleapis//google/api/expr/v1alpha1:checked_cc_proto",
"@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto": "@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
"@opencensus_proto//opencensus/proto/trace/v1:trace_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_proto_cc",
"@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto_cc",
"@opentelemetry_proto//:trace": "@opentelemetry_proto//:trace_cc_proto",
"@opentelemetry_proto//:logs": "@opentelemetry_proto//:logs_cc_proto",
"@opentelemetry_proto//:metrics": "@opentelemetry_proto//:metrics_cc_proto",
Expand Down
23 changes: 0 additions & 23 deletions api/bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ def api_dependencies():
name = "prometheus_metrics_model",
build_file_content = PROMETHEUSMETRICS_BUILD_CONTENT,
)
external_http_archive(
name = "opencensus_proto",
)
external_http_archive(
name = "rules_proto",
)
Expand Down Expand Up @@ -85,26 +82,6 @@ go_proto_library(
)
"""

OPENCENSUSTRACE_BUILD_CONTENT = """
load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library")
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
api_cc_py_proto_library(
name = "trace_model",
srcs = [
"trace.proto",
],
visibility = ["//visibility:public"],
)
go_proto_library(
name = "trace_model_go_proto",
importpath = "trace_model",
proto = ":trace_model",
visibility = ["//visibility:public"],
)
"""

ZIPKINAPI_BUILD_CONTENT = """
load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library")
Expand Down
13 changes: 0 additions & 13 deletions api/bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -88,19 +88,6 @@ REPOSITORY_LOCATIONS_SPEC = dict(
license = "Apache-2.0",
license_url = "https://github.com/googleapis/googleapis/blob/{version}/LICENSE",
),
opencensus_proto = dict(
project_name = "OpenCensus Proto",
project_desc = "Language Independent Interface Types For OpenCensus",
project_url = "https://github.com/census-instrumentation/opencensus-proto",
version = "0.4.1",
sha256 = "e3d89f7f9ed84c9b6eee818c2e9306950519402bf803698b15c310b77ca2f0f3",
release_date = "2022-09-23",
strip_prefix = "opencensus-proto-{version}/src",
urls = ["https://github.com/census-instrumentation/opencensus-proto/archive/v{version}.tar.gz"],
use_category = ["api"],
license = "Apache-2.0",
license_url = "https://github.com/census-instrumentation/opencensus-proto/blob/v{version}/LICENSE",
),
prometheus_metrics_model = dict(
project_name = "Prometheus client model",
project_desc = "Data model artifacts for Prometheus",
Expand Down
4 changes: 0 additions & 4 deletions api/buf.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ deps:
owner: googleapis
repository: googleapis
commit: 62f35d8aed1149c291d606d958a7ce32
- remote: buf.build
owner: opencensus
repository: opencensus
commit: bc2645b085534e4f8ebae3ef20088165
- remote: buf.build
owner: opentelemetry
repository: opentelemetry
Expand Down
1 change: 0 additions & 1 deletion api/buf.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: v1
deps:
- buf.build/googleapis/googleapis:62f35d8aed1149c291d606d958a7ce32
- buf.build/opencensus/opencensus
- buf.build/prometheus/client-model
- buf.build/opentelemetry/opentelemetry
- buf.build/gogo/protobuf
Expand Down
14 changes: 0 additions & 14 deletions api/envoy/service/trace/v2/BUILD

This file was deleted.

46 changes: 0 additions & 46 deletions api/envoy/service/trace/v2/trace_service.proto

This file was deleted.

14 changes: 0 additions & 14 deletions api/envoy/service/trace/v3/BUILD

This file was deleted.

55 changes: 0 additions & 55 deletions api/envoy/service/trace/v3/trace_service.proto

This file was deleted.

1 change: 0 additions & 1 deletion docs/v2_mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@
"envoy/service/status/v3/csds.proto": "envoy/service/status/v2/csds.proto",
"envoy/config/tap/v3/common.proto": "envoy/service/tap/v2alpha/common.proto",
"envoy/service/tap/v3/tap.proto": "envoy/service/tap/v2alpha/tap.proto",
"envoy/service/trace/v3/trace_service.proto": "envoy/service/trace/v2/trace_service.proto",
"envoy/type/metadata/v3/metadata.proto": "envoy/type/metadata/v2/metadata.proto",
"envoy/type/tracing/v3/custom_tag.proto": "envoy/type/tracing/v2/custom_tag.proto"
}

0 comments on commit 3731fb5

Please sign in to comment.