Don't build unused 'tcp_stats' extension, which can't compile in centos7

RedisLabs · May 12, 2022 · b1cf960 · b1cf960
1 parent dba169b
commit b1cf960
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/api/BUILD b/api/BUILD
@@ -253,7 +253,8 @@ proto_library(
         "//envoy/extensions/transport_sockets/s2a/v3:pkg",
         "//envoy/extensions/transport_sockets/starttls/v3:pkg",
         "//envoy/extensions/transport_sockets/tap/v3:pkg",
-        "//envoy/extensions/transport_sockets/tcp_stats/v3:pkg",
+        # tcp_stats cannot be compiled in rhel7 due to old linux headers (tcp.h).
+        # "//envoy/extensions/transport_sockets/tcp_stats/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
         "//envoy/extensions/upstreams/http/generic/v3:pkg",
         "//envoy/extensions/upstreams/http/http/v3:pkg",

diff --git a/api/envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.proto b/api/envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 
-package envoy.extensions.transport_sockets.tcp_stats.v3;
+
+// tcp_stats cannot be compiled in rhel7 due to old linux headers (tcp.h).
+// package envoy.extensions.transport_sockets.tcp_stats.v3;
 
 import "envoy/config/core/v3/base.proto";
 
@@ -9,10 +11,12 @@ import "google/protobuf/duration.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.transport_sockets.tcp_stats.v3";
+// tcp_stats cannot be compiled in rhel7 due to old linux headers (tcp.h).
+// option java_package = "io.envoyproxy.envoy.extensions.transport_sockets.tcp_stats.v3";
 option java_outer_classname = "TcpStatsProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tcp_stats/v3;tcp_statsv3";
+// tcp_stats cannot be compiled in rhel7 due to old linux headers (tcp.h).
+// option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tcp_stats/v3;tcp_statsv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: TCP Stats Transport Socket wrapper]

diff --git a/api/versioning/BUILD b/api/versioning/BUILD
@@ -193,7 +193,8 @@ proto_library(
         "//envoy/extensions/transport_sockets/s2a/v3:pkg",
         "//envoy/extensions/transport_sockets/starttls/v3:pkg",
         "//envoy/extensions/transport_sockets/tap/v3:pkg",
-        "//envoy/extensions/transport_sockets/tcp_stats/v3:pkg",
+        # tcp_stats cannot be compiled in rhel7 due to old linux headers (tcp.h).
+        # "//envoy/extensions/transport_sockets/tcp_stats/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
         "//envoy/extensions/upstreams/http/generic/v3:pkg",
         "//envoy/extensions/upstreams/http/http/v3:pkg",

diff --git a/source/extensions/extensions_build_config.bzl b/source/extensions/extensions_build_config.bzl
@@ -208,7 +208,8 @@ EXTENSIONS = {
     "envoy.transport_sockets.raw_buffer":               "//source/extensions/transport_sockets/raw_buffer:config",
     "envoy.transport_sockets.tap":                      "//source/extensions/transport_sockets/tap:config",
     "envoy.transport_sockets.starttls":                 "//source/extensions/transport_sockets/starttls:config",
-    "envoy.transport_sockets.tcp_stats":                "//source/extensions/transport_sockets/tcp_stats:config",
+    # tcp_stats cannot be compiled in rhel7 due to old linux headers (tcp.h).
+    # "envoy.transport_sockets.tcp_stats":                "//source/extensions/transport_sockets/tcp_stats:config",
 
     #
     # Retry host predicates

diff --git a/source/extensions/extensions_metadata.yaml b/source/extensions/extensions_metadata.yaml
@@ -673,12 +673,13 @@ envoy.transport_sockets.tap:
   - envoy.transport_sockets.upstream
   security_posture: requires_trusted_downstream_and_upstream
   status: alpha
-envoy.transport_sockets.tcp_stats:
-  categories:
-  - envoy.transport_sockets.downstream
-  - envoy.transport_sockets.upstream
-  security_posture: robust_to_untrusted_downstream_and_upstream
-  status: alpha
+# tcp_stats cannot be compiled in rhel7 due to old linux headers (tcp.h).
+# envoy.transport_sockets.tcp_stats:
+#   categories:
+#   - envoy.transport_sockets.downstream
+#   - envoy.transport_sockets.upstream
+#   security_posture: robust_to_untrusted_downstream_and_upstream
+#   status: alpha
 envoy.transport_sockets.tls:
   categories:
   - envoy.transport_sockets.downstream

diff --git a/tools/code_format/check_format.py b/tools/code_format/check_format.py
@@ -75,7 +75,7 @@
 # Histogram names which are allowed to be suffixed with the unit symbol, all of the pre-existing
 # ones were grandfathered as part of PR #8484 for backwards compatibility.
 HISTOGRAM_WITH_SI_SUFFIX_ALLOWLIST = (
-    "cx_rtt_us", "cx_rtt_variance_us", "downstream_cx_length_ms", "downstream_cx_length_ms",
+    "downstream_cx_length_ms", "downstream_cx_length_ms",
     "initialization_time_ms", "loop_duration_us", "poll_delay_us", "request_time_ms",
     "upstream_cx_connect_ms", "upstream_cx_length_ms")