Merge branch 'master' into shush-e2e

examples/cpp/csm/csm_greeter_client.cc

@@ -158,7 +158,7 @@ class GreeterClient {
   absl::optional<Cookie> cookie_from_server_;
 };
 
-absl::StatusOr<grpc::experimental::CsmObservability> InitializeObservability() {
+absl::StatusOr<grpc::CsmObservability> InitializeObservability() {
   opentelemetry::exporter::metrics::PrometheusExporterOptions opts;
   // default was "localhost:9464" which causes connection issue across GKE pods
   opts.url = "0.0.0.0:9464";
@@ -167,7 +167,7 @@ absl::StatusOr<grpc::experimental::CsmObservability> InitializeObservability() {
   auto meter_provider =
       std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
   meter_provider->AddMetricReader(std::move(prometheus_exporter));
-  return grpc::experimental::CsmObservabilityBuilder()
+  return grpc::CsmObservabilityBuilder()
       .SetMeterProvider(std::move(meter_provider))
       .BuildAndRegister();
 }

examples/cpp/csm/csm_greeter_server.cc

@@ -108,7 +108,7 @@ int main(int argc, char** argv) {
   auto meter_provider =
       std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
   meter_provider->AddMetricReader(std::move(prometheus_exporter));
-  auto observability = grpc::experimental::CsmObservabilityBuilder()
+  auto observability = grpc::CsmObservabilityBuilder()
                            .SetMeterProvider(std::move(meter_provider))
                            .BuildAndRegister();
   if (!observability.ok()) {

include/grpcpp/ext/csm_observability.h

@@ -36,8 +36,6 @@ namespace internal {
 class OpenTelemetryPluginBuilderImpl;
 }  // namespace internal
 
-namespace experimental {
-
 // This object maintains state around the registered CsmObservability plugin.
 // The application is responsible for retaining this object until it has closed
 // all channels and servers that are recording metrics.
@@ -102,7 +100,15 @@ class CsmObservabilityBuilder {
   std::unique_ptr<grpc::internal::OpenTelemetryPluginBuilderImpl> builder_;
 };
 
+namespace experimental {
+// TODO(yashykt): Remove this once no longer needed.
+using CsmObservability GRPC_DEPRECATED("Use grpc::CsmObservability instead.") =
+    grpc::CsmObservability;
+using CsmObservabilityBuilder GRPC_DEPRECATED(
+    "Use grpc::CsmObservabilityBuilder instead.") =
+    grpc::CsmObservabilityBuilder;
 }  // namespace experimental
+
 }  // namespace grpc
 
 #endif  // GRPCPP_EXT_CSM_OBSERVABILITY_H

src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc

@@ -249,6 +249,13 @@ absl::StatusOr<int> ListenerContainerAddAllLocalAddresses(
     return absl::FailedPreconditionError(
         absl::StrCat("getifaddrs: ", std::strerror(errno)));
   }
+
+  static const bool is_ipv4_available = [] {
+    const int fd = socket(AF_INET, SOCK_DGRAM, 0);
+    if (fd >= 0) close(fd);
+    return fd >= 0;
+  }();
+
   for (ifa_it = ifa; ifa_it != nullptr; ifa_it = ifa_it->ifa_next) {
     ResolvedAddress addr;
     socklen_t len;
@@ -256,6 +263,9 @@ absl::StatusOr<int> ListenerContainerAddAllLocalAddresses(
     if (ifa_it->ifa_addr == nullptr) {
       continue;
     } else if (ifa_it->ifa_addr->sa_family == AF_INET) {
+      if (!is_ipv4_available) {
+        continue;
+      }
       len = static_cast<socklen_t>(sizeof(sockaddr_in));
     } else if (ifa_it->ifa_addr->sa_family == AF_INET6) {
       len = static_cast<socklen_t>(sizeof(sockaddr_in6));

src/cpp/ext/csm/csm_observability.cc

@@ -100,8 +100,6 @@ class CsmOpenTelemetryPluginOption
 
 }  // namespace internal
 
-namespace experimental {
-
 //
 // CsmObservability
 //
@@ -164,5 +162,4 @@ absl::StatusOr<CsmObservability> CsmObservabilityBuilder::BuildAndRegister() {
   return CsmObservability();
 }
 
-}  // namespace experimental
 }  // namespace grpc

test/cpp/ext/csm/csm_observability_test.cc

@@ -32,7 +32,7 @@ namespace testing {
 namespace {
 
 TEST(CsmObservabilityBuilderTest, Basic) {
-  EXPECT_EQ(experimental::CsmObservabilityBuilder().BuildAndRegister().status(),
+  EXPECT_EQ(CsmObservabilityBuilder().BuildAndRegister().status(),
             absl::OkStatus());
 }
 
@@ -41,7 +41,7 @@ TEST(GsmDependencyTest, GoogleCloudOpenTelemetryDependency) {
 }
 
 TEST(CsmChannelTargetSelectorTest, NonXdsTargets) {
-  auto obs = experimental::CsmObservabilityBuilder().BuildAndRegister();
+  auto obs = CsmObservabilityBuilder().BuildAndRegister();
   EXPECT_FALSE(internal::CsmChannelTargetSelector("foo.bar.google.com"));
   EXPECT_FALSE(internal::CsmChannelTargetSelector("dns:///foo.bar.google.com"));
   EXPECT_FALSE(
@@ -51,24 +51,24 @@ TEST(CsmChannelTargetSelectorTest, NonXdsTargets) {
 }
 
 TEST(CsmChannelTargetSelectorTest, XdsTargets) {
-  auto obs = experimental::CsmObservabilityBuilder().BuildAndRegister();
+  auto obs = CsmObservabilityBuilder().BuildAndRegister();
   EXPECT_TRUE(internal::CsmChannelTargetSelector("xds:///foo"));
   EXPECT_TRUE(internal::CsmChannelTargetSelector("xds:///foo.bar"));
 }
 
 TEST(CsmChannelTargetSelectorTest, XdsTargetsWithNonTDAuthority) {
-  auto obs = experimental::CsmObservabilityBuilder().BuildAndRegister();
+  auto obs = CsmObservabilityBuilder().BuildAndRegister();
   EXPECT_FALSE(internal::CsmChannelTargetSelector("xds://authority/foo"));
 }
 
 TEST(CsmChannelTargetSelectorTest, XdsTargetsWithTDAuthority) {
-  auto obs = experimental::CsmObservabilityBuilder().BuildAndRegister();
+  auto obs = CsmObservabilityBuilder().BuildAndRegister();
   EXPECT_TRUE(internal::CsmChannelTargetSelector(
       "xds://traffic-director-global.xds.googleapis.com/foo"));
 }
 
 TEST(CsmChannelTargetSelectorTest, CsmObservabilityOutOfScope) {
-  { auto obs = experimental::CsmObservabilityBuilder().BuildAndRegister(); }
+  { auto obs = CsmObservabilityBuilder().BuildAndRegister(); }
   // When CsmObservability goes out of scope, the target selector should return
   // false as well.
   EXPECT_FALSE(internal::CsmChannelTargetSelector("foo.bar.google.com"));
@@ -78,18 +78,18 @@ TEST(CsmChannelTargetSelectorTest, CsmObservabilityOutOfScope) {
 }
 
 TEST(CsmServerSelectorTest, ChannelArgsWithoutXdsServerArg) {
-  auto obs = experimental::CsmObservabilityBuilder().BuildAndRegister();
+  auto obs = CsmObservabilityBuilder().BuildAndRegister();
   EXPECT_FALSE(internal::CsmServerSelector(grpc_core::ChannelArgs()));
 }
 
 TEST(CsmServerSelectorTest, ChannelArgsWithXdsServerArg) {
-  auto obs = experimental::CsmObservabilityBuilder().BuildAndRegister();
+  auto obs = CsmObservabilityBuilder().BuildAndRegister();
   EXPECT_TRUE(internal::CsmServerSelector(
       grpc_core::ChannelArgs().Set(GRPC_ARG_XDS_ENABLED_SERVER, true)));
 }
 
 TEST(CsmServerSelectorTest, CsmObservabilityOutOfScope) {
-  { auto obs = experimental::CsmObservabilityBuilder().BuildAndRegister(); }
+  { auto obs = CsmObservabilityBuilder().BuildAndRegister(); }
   // When CsmObservability goes out of scope, the server selector should return
   // false as well.
   EXPECT_FALSE(internal::CsmServerSelector(grpc_core::ChannelArgs()));

test/cpp/interop/xds_interop_client.cc

@@ -427,7 +427,7 @@ void RunTestLoop(std::chrono::duration<double> duration_per_query,
   GPR_UNREACHABLE_CODE(thread.join());
 }
 
-grpc::experimental::CsmObservability EnableCsmObservability() {
+grpc::CsmObservability EnableCsmObservability() {
   gpr_log(GPR_DEBUG, "Registering Prometheus exporter");
   opentelemetry::exporter::metrics::PrometheusExporterOptions opts;
   // default was "localhost:9464" which causes connection issue across GKE
@@ -438,7 +438,7 @@ grpc::experimental::CsmObservability EnableCsmObservability() {
   auto meter_provider =
       std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
   meter_provider->AddMetricReader(std::move(prometheus_exporter));
-  auto observability = grpc::experimental::CsmObservabilityBuilder()
+  auto observability = grpc::CsmObservabilityBuilder()
                            .SetMeterProvider(std::move(meter_provider))
                            .BuildAndRegister();
   assert(observability.ok());
@@ -553,7 +553,7 @@ int main(int argc, char** argv) {
   }
 
   BuildRpcConfigsFromFlags(&rpc_config_queue);
-  grpc::experimental::CsmObservability observability;
+  grpc::CsmObservability observability;
   if (absl::GetFlag(FLAGS_enable_csm_observability)) {
     observability = EnableCsmObservability();
   }

test/cpp/interop/xds_interop_server.cc

@@ -43,7 +43,7 @@ ABSL_FLAG(bool, secure_mode, false,
 ABSL_FLAG(bool, enable_csm_observability, false,
           "Whether to enable CSM Observability");
 
-grpc::experimental::CsmObservability EnableCsmObservability() {
+grpc::CsmObservability EnableCsmObservability() {
   gpr_log(GPR_DEBUG, "Registering Prometheus exporter");
   opentelemetry::exporter::metrics::PrometheusExporterOptions opts;
   // default was "localhost:9464" which causes connection issue across GKE
@@ -54,7 +54,7 @@ grpc::experimental::CsmObservability EnableCsmObservability() {
   auto meter_provider =
       std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
   meter_provider->AddMetricReader(std::move(prometheus_exporter));
-  auto observability = grpc::experimental::CsmObservabilityBuilder()
+  auto observability = grpc::CsmObservabilityBuilder()
                            .SetMeterProvider(std::move(meter_provider))
                            .BuildAndRegister();
   assert(observability.ok());
@@ -81,7 +81,7 @@ int main(int argc, char** argv) {
   }
   grpc::EnableDefaultHealthCheckService(false);
   bool enable_csm_observability = absl::GetFlag(FLAGS_enable_csm_observability);
-  grpc::experimental::CsmObservability observability;
+  grpc::CsmObservability observability;
   if (enable_csm_observability) {
     observability = EnableCsmObservability();
   }

tools/internal_ci/helper_scripts/check_python_artifacts_size.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Copyright 2024 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Checks if any of the Python artifacts exceeds a certern size limit since
+# Pypi has a per-file size limit.
+
+set -ex
+
+find . -path "*/artifacts/*" -size +80M | egrep '.*' && echo "Found Python artifacts larger than 80 MB." && FAILED="true"
+
+
+if [ "$FAILED" != "" ]
+then
+  exit 1
+fi

tools/internal_ci/linux/grpc_distribtests_python.sh

@@ -54,6 +54,9 @@ cp -r artifacts/* input_artifacts/ || true
 # a better signal about which distribtest are affected by the currently broken artifact builds.
 tools/run_tests/task_runner.py -f distribtest linux python ${TASK_RUNNER_EXTRA_FILTERS} -j 12 -x distribtests/sponge_log.xml || FAILED="true"
 
+# This step checks if any of the artifacts exceeds a per-file size limit.
+tools/internal_ci/helper_scripts/check_python_artifacts_size.sh
+
 tools/internal_ci/helper_scripts/store_artifacts_from_moved_src_tree.sh
 
 if [ "$FAILED" != "" ]

tools/internal_ci/macos/grpc_distribtests_python.sh

@@ -49,6 +49,9 @@ cp -r input_artifacts/python_*/* artifacts/ || true
 # TODO(jtattermusch): Here we would normally run python macos distribtests, but currently no such tests are defined
 # in distribtest_targets.py
 
+# This step checks if any of the artifacts exceeds a per-file size limit.
+tools/internal_ci/helper_scripts/check_python_artifacts_size.sh
+
 tools/internal_ci/helper_scripts/store_artifacts_from_moved_src_tree.sh
 
 if [ "$FAILED" != "" ]

tools/internal_ci/windows/grpc_distribtests_python.bat

@@ -42,6 +42,9 @@ bash -c "cp -r input_artifacts/python_*/* artifacts/ || true"
 @rem TODO(jtattermusch): Here we would normally run python windows distribtests, but currently no such tests are defined
 @rem in distribtest_targets.py
 
+@rem This step checks if any of the artifacts exceeds a per-file size limit.
+bash tools/internal_ci/helper_scripts/check_python_artifacts_size.sh
+
 bash tools/internal_ci/helper_scripts/store_artifacts_from_moved_src_tree.sh
 
 if not "%FAILED%" == "" (