Skip to content

Commit

Permalink
Revert "stat_sinks: add OpenTelemetry stats sink (envoyproxy#26620)"
Browse files Browse the repository at this point in the history
This reverts commit a6d46b6.
  • Loading branch information
alyssawilk committed Apr 25, 2023
1 parent a6d46b6 commit e28cce3
Show file tree
Hide file tree
Showing 27 changed files with 2 additions and 1,336 deletions.
1 change: 0 additions & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ extensions/filters/common/original_src @snowp @klarose
/*/extensions/stat_sinks/graphite_statsd @vaccarium @mattklein123
/*/extensions/stat_sinks/hystrix @trabetti @jmarantz
/*/extensions/stat_sinks/metrics_service @ramaraochavali @jmarantz
/*/extensions/stat_sinks/open_telemetry @ohadvano @mattklein123
# webassembly stat-sink extensions
/*/extensions/stat_sinks/wasm @mpwarres @mathetake @lizan
/*/extensions/resource_monitors/injected_resource @eziskind @htuch
Expand Down
1 change: 0 additions & 1 deletion api/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ proto_library(
"//envoy/extensions/retry/host/previous_hosts/v3:pkg",
"//envoy/extensions/retry/priority/previous_priorities/v3:pkg",
"//envoy/extensions/stat_sinks/graphite_statsd/v3:pkg",
"//envoy/extensions/stat_sinks/open_telemetry/v3:pkg",
"//envoy/extensions/stat_sinks/wasm/v3:pkg",
"//envoy/extensions/transport_sockets/alts/v3:pkg",
"//envoy/extensions/transport_sockets/http_11_proxy/v3:pkg",
Expand Down
3 changes: 0 additions & 3 deletions api/bazel/external_proto_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = {
"@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",
"@opentelemetry_proto//:common": "@opentelemetry_proto//:common_go_proto",
}

Expand All @@ -46,7 +45,6 @@ EXTERNAL_PROTO_CC_BAZEL_DEP_MAP = {
"@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",
"@opentelemetry_proto//:common": "@opentelemetry_proto//:common_cc_proto",
}

Expand All @@ -58,6 +56,5 @@ EXTERNAL_PROTO_PY_BAZEL_DEP_MAP = {
"@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto": "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto_py",
"@opentelemetry_proto//:trace": "@opentelemetry_proto//:trace_py_proto",
"@opentelemetry_proto//:logs": "@opentelemetry_proto//:logs_py_proto",
"@opentelemetry_proto//:metrics": "@opentelemetry_proto//:metrics_py_proto",
"@opentelemetry_proto//:common": "@opentelemetry_proto//:common_py_proto",
}
20 changes: 0 additions & 20 deletions api/bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -163,26 +163,6 @@ go_proto_library(
visibility = ["//visibility:public"],
)
api_cc_py_proto_library(
name = "metrics",
srcs = [
"opentelemetry/proto/collector/metrics/v1/metrics_service.proto",
"opentelemetry/proto/metrics/v1/metrics.proto",
],
deps = [
"//:common",
"//:resource",
],
visibility = ["//visibility:public"],
)
go_proto_library(
name = "metrics_go_proto",
importpath = "go.opentelemetry.io/proto/otlp/metrics/v1",
proto = ":metrics",
visibility = ["//visibility:public"],
)
api_cc_py_proto_library(
name = "trace",
srcs = [
Expand Down
12 changes: 0 additions & 12 deletions api/envoy/extensions/stat_sinks/open_telemetry/v3/BUILD

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion api/versioning/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ proto_library(
"//envoy/extensions/retry/host/previous_hosts/v3:pkg",
"//envoy/extensions/retry/priority/previous_priorities/v3:pkg",
"//envoy/extensions/stat_sinks/graphite_statsd/v3:pkg",
"//envoy/extensions/stat_sinks/open_telemetry/v3:pkg",
"//envoy/extensions/stat_sinks/wasm/v3:pkg",
"//envoy/extensions/transport_sockets/alts/v3:pkg",
"//envoy/extensions/transport_sockets/http_11_proxy/v3:pkg",
Expand Down
5 changes: 0 additions & 5 deletions changelogs/current.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,9 @@ new_features:
added Runtime feature ``envoy.reloadable_features.max_request_headers_size_kb`` to override the default value of
:ref:`max request headers size
<envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.max_request_headers_kb>`.
- area: stat_sinks
change: |
Added ``envoy.stat_sinks.open_telemetry`` stats_sink, that supports flushing metrics by the OTLP protocol,
for supported Open Telemetry collectors.
- area: redis_proxy
change: |
added new configuration field :ref:`key_formatter
<envoy_v3_api_field_extensions.filters.network.redis_proxy.v3.RedisProxy.PrefixRoutes.Route.key_formatter>` to format redis key.
The field supports using %KEY% as a formatter command for substituting the redis key as part of the substitution formatter expression.
deprecated:
1 change: 0 additions & 1 deletion docs/root/api-v3/config/stat_sinks/stat_sinks.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ Stat sinks
:maxdepth: 2

../../extensions/stat_sinks/graphite_statsd/v3/*
../../extensions/stat_sinks/open_telemetry/v3/*
../../extensions/stat_sinks/wasm/v3/*

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ Stat sinks
:maxdepth: 2

graphite_statsd_stat_sink
open_telemetry_stat_sink
wasm_stat_sink
1 change: 0 additions & 1 deletion source/extensions/extensions_build_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ EXTENSIONS = {
"envoy.stat_sinks.graphite_statsd": "//source/extensions/stat_sinks/graphite_statsd:config",
"envoy.stat_sinks.hystrix": "//source/extensions/stat_sinks/hystrix:config",
"envoy.stat_sinks.metrics_service": "//source/extensions/stat_sinks/metrics_service:config",
"envoy.stat_sinks.open_telemetry": "//source/extensions/stat_sinks/open_telemetry:config",
"envoy.stat_sinks.statsd": "//source/extensions/stat_sinks/statsd:config",
"envoy.stat_sinks.wasm": "//source/extensions/stat_sinks/wasm:config",

Expand Down
7 changes: 0 additions & 7 deletions source/extensions/extensions_metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1026,13 +1026,6 @@ envoy.stat_sinks.metrics_service:
status: stable
type_urls:
- envoy.config.metrics.v3.MetricsServiceConfig
envoy.stat_sinks.open_telemetry:
categories:
- envoy.stats_sinks
security_posture: data_plane_agnostic
status: alpha
type_urls:
- envoy.extensions.stat_sinks.open_telemetry.v3.SinkConfig
envoy.stat_sinks.statsd:
categories:
- envoy.stats_sinks
Expand Down
45 changes: 0 additions & 45 deletions source/extensions/stat_sinks/open_telemetry/BUILD

This file was deleted.

60 changes: 0 additions & 60 deletions source/extensions/stat_sinks/open_telemetry/config.cc

This file was deleted.

34 changes: 0 additions & 34 deletions source/extensions/stat_sinks/open_telemetry/config.h

This file was deleted.

Loading

0 comments on commit e28cce3

Please sign in to comment.