sendbird · gavin-jeong · Sep 13, 2024 · Sep 13, 2024 · Sep 23, 2024 · Sep 23, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,8 +1,175 @@
 version: 2.1
 
+orbs:
+  aws-ecr: circleci/[email protected]
+  aws-cli: circleci/[email protected]
+
+workflows:
+  build:
+    jobs:
+      - build:
+          name: build_arm64
+          filters:
+            tags:
+              only:
+                - /^v.*/
+            branches:
+              ignore:
+                - /.*/
+          context: circleci-soda-bot
+          machine-type: arm64
+      - build:
+          name: build_x64
+          filters:
+            tags:
+              only:
+                - /^v.*/
+            branches:
+              ignore:
+                - /.*/
+          context: circleci-soda-bot
+          machine-type: amd64
+      - upload_docker:
+          filters:
+            tags:
+              only:
+                - /^v.*/
+            branches:
+              ignore:
+                - /.*/
+          context: circleci-soda-bot
+          requires:
+            - build_arm64
+            - build_x64
+
+
+executors:
+  arm64:
+    machine:
+      resource_class: arm.2xlarge
+      image: ubuntu-2204:current
+  amd64:
+    machine:
+      resource_class: 2xlarge
+      image: ubuntu-2204:current
+
+
 jobs:
+  upload_docker:
+    machine:
+      image: ubuntu-2204:current
+    steps:
+      - checkout
+      - aws-cli/setup:
+          aws-access-key-id: AWS_ACCESS_KEY_ID
+          aws-secret-access-key: AWS_SECRET_ACCESS_KEY
+          profile-name: default
+          configure-default-region: false
+
+      - run:
+          name: Set environment
+          command: |
+            echo 'export AWS_REGION=us-east-1' >> $BASH_ENV
+            echo 'export AWS_ROLE_ARN="$AWS_ROLE_CI_OPS"' >> $BASH_ENV
+            echo "export ECR_ACCOUNT_NUM=$(echo $AWS_ROLE_CI_OPS | grep -Eo '[0-9]{12}')" >> $BASH_ENV
+            echo 'export ECR_HOST=${ECR_ACCOUNT_NUM}.dkr.ecr.${AWS_REGION}.amazonaws.com' >> $BASH_ENV
+
+      - run:
+          name: Set AWS credentials
+          command: |
+            mkdir -p ~/.aws
+            echo '
+            [profile circleci]
+            source_profile=default
+            role_arn='"$AWS_ROLE_CI_OPS"'
+            ' >> ~/.aws/config
+
+      - run:
+          name: Set envoy build environment
+          command: |
+            export VERSION=$(echo $CIRCLE_TAG | sed 's/v//')
+            echo "export DOCKER_IMAGE_PREFIX=mesg/envoy" >> $BASH_ENV
+            echo "export DOCKER_REGISTRY=${ECR_HOST}" >> $BASH_ENV
+            echo "export DOCKERHUB_USERNAME=AWS" >> $BASH_ENV
+            echo "export CI_BRANCH=refs/heads/release/v${VERSION}" >> $BASH_ENV
+            echo "export CI_SHA1=${CIRCLE_SHA1}" >> $BASH_ENV
+            echo "export ENVOY_DOCKER_IN_DOCKER=1" >> $BASH_ENV
+            echo "export ENVOY_VERSION=${VERSION}" >> $BASH_ENV
+            cat $BASH_ENV
+            echo "export DOCKERHUB_PASSWORD=$(aws ecr get-login-password --region us-east-1 --profile circleci)" >> $BASH_ENV
+
+      - attach_workspace:
+          at: /tmp/workspace
+      - run:
+          name: copy files from previous steps
+          command: |
+            mkdir -p /tmp/envoy-docker-build/envoy/x64/bin
+            mkdir -p /tmp/envoy-docker-build/envoy/arm64/bin
+            cp /tmp/workspace/release_archive/release_x64.tar.zst /tmp/envoy-docker-build/envoy/x64/bin/release.tar.zst
+            cp /tmp/workspace/release_archive/release_arm64.tar.zst /tmp/envoy-docker-build/envoy/arm64/bin/release.tar.zst
+
+      - run:
+          name: Build docker image
+          command: ./ci/run_envoy_docker.sh 'ci/do_ci.sh docker'
+
   build:
-    docker:
-    - image: debian:bullseye-slim@sha256:d3d0d14f49b49a4dd98a436711f5646dc39e1c99203ef223d1b6620061e2c0e5
+    parameters:
+      machine-type:
+        type: executor
+    executor: << parameters.machine-type >>
+
     steps:
-    - run: echo "no circle on this branch"
+      - checkout
+      - aws-cli/setup:
+          aws-access-key-id: AWS_ACCESS_KEY_ID
+          aws-secret-access-key: AWS_SECRET_ACCESS_KEY
+          profile-name: default
+          configure-default-region: false
+
+      - run:
+          name: Set environment
+          command: |
+            echo 'export AWS_REGION=us-east-1' >> $BASH_ENV
+            echo 'export AWS_ROLE_ARN="$AWS_ROLE_CI_OPS"' >> $BASH_ENV
+            echo "export ECR_ACCOUNT_NUM=$(echo $AWS_ROLE_CI_OPS | grep -Eo '[0-9]{12}')" >> $BASH_ENV
+            echo 'export ECR_HOST=${ECR_ACCOUNT_NUM}.dkr.ecr.${AWS_REGION}.amazonaws.com' >> $BASH_ENV
+
+      - run:
+          name: Set AWS credentials
+          command: |
+            mkdir -p ~/.aws
+            echo '
+            [profile circleci]
+            source_profile=default
+            role_arn='"$AWS_ROLE_CI_OPS"'
+            ' >> ~/.aws/config
+
+      - run:
+          name: Set envoy build environment
+          command: |
+            export VERSION=$(echo $CIRCLE_TAG | sed 's/v//')
+            echo "export DOCKER_IMAGE_PREFIX=mesg/envoy" >> $BASH_ENV
+            echo "export DOCKER_REGISTRY=${ECR_HOST}" >> $BASH_ENV
+            echo "export DOCKERHUB_USERNAME=AWS" >> $BASH_ENV
+            echo "export CI_BRANCH=refs/heads/release/v${VERSION}" >> $BASH_ENV
+            echo "export CI_SHA1=${CIRCLE_SHA1}" >> $BASH_ENV
+            echo "export ENVOY_DOCKER_IN_DOCKER=1" >> $BASH_ENV
+            echo "export ENVOY_VERSION=${VERSION}" >> $BASH_ENV
+            cat $BASH_ENV
+            echo "export DOCKERHUB_PASSWORD=$(aws ecr get-login-password --region us-east-1 --profile circleci)" >> $BASH_ENV
+
+      - run:
+          name: Building envoy
+          command: |
+            ./ci/run_envoy_docker.sh 'ci/do_ci.sh release test/extensions/tracers/opentelemetry:*'
+            mkdir release_archive
+            ARCH=$(uname -m)
+            if [[ ${ARCH} == "x86_64" ]]; then
+              cp /tmp/envoy-docker-build/envoy/x64/bin/release.tar.zst release_archive/release_x64.tar.zst
+            else
+              cp /tmp/envoy-docker-build/envoy/arm64/bin/release.tar.zst release_archive/release_arm64.tar.zst
+            fi
+
+      - persist_to_workspace:
+          root: .
+          paths: release_archive
diff --git a/ci/docker_ci.sh b/ci/docker_ci.sh
@@ -23,6 +23,8 @@ set -e
 # Workaround for https://github.com/envoyproxy/envoy/issues/26634
 DOCKER_BUILD_TIMEOUT="${DOCKER_BUILD_TIMEOUT:-500}"
 
+DOCKERHUB_REGISTRY="${DOCKERHUB_REGISTRY:-docker.io}"
+
 DOCKER_PLATFORM="${DOCKER_PLATFORM:-linux/arm64,linux/amd64}"
 
 function is_windows() {
@@ -107,7 +109,7 @@ if is_windows; then
     BUILD_COMMAND=("build")
 else
     # "-google-vrp" must come afer "" to ensure we rebuild the local base image dependency.
-    BUILD_TYPES=("" "-debug" "-contrib" "-contrib-debug" "-distroless" "-google-vrp" "-tools")
+    BUILD_TYPES=("")
 
     # Configure docker-buildx tools
     BUILD_COMMAND=("buildx" "build")
@@ -378,7 +380,7 @@ build_and_maybe_push_image_and_variants () {
 login_docker () {
     echo ">> LOGIN"
     if [[ -z "$DOCKER_CI_DRYRUN" ]]; then
-       docker login -u "$DOCKERHUB_USERNAME" -p "$DOCKERHUB_PASSWORD"
+       docker login -u "$DOCKERHUB_USERNAME" -p "$DOCKERHUB_PASSWORD" "$DOCKER_REGISTRY"
     fi
 }
 

diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh
@@ -136,10 +136,13 @@ docker run --rm \
        -e CI_BRANCH \
        -e CI_SHA1 \
        -e CI_TARGET_BRANCH \
+       -e DOCKER_IMAGE_PREFIX \
+       -e DOCKER_REGISTRY \
        -e DOCKERHUB_USERNAME \
        -e DOCKERHUB_PASSWORD \
        -e ENVOY_DOCKER_SAVE_IMAGE \
        -e ENVOY_STDLIB \
+       -e ENVOY_VERSION \
        -e BUILD_REASON \
        -e BAZEL_REMOTE_INSTANCE \
        -e GCP_SERVICE_ACCOUNT_KEY \

diff --git a/source/extensions/filters/network/common/redis/supported_commands.h b/source/extensions/filters/network/common/redis/supported_commands.h
@@ -41,7 +41,7 @@ struct SupportedCommands {
    * @return commands which hash on the fourth argument
    */
   static const absl::flat_hash_set<std::string>& evalCommands() {
-    CONSTRUCT_ON_FIRST_USE(absl::flat_hash_set<std::string>, "eval", "evalsha");
+    CONSTRUCT_ON_FIRST_USE(absl::flat_hash_set<std::string>, "eval", "evalsha", "eval_ro", "evalsha_ro");
   }
 
   /**

diff --git a/source/extensions/tracers/opentelemetry/span_context_extractor.h b/source/extensions/tracers/opentelemetry/span_context_extractor.h
@@ -15,8 +15,8 @@ namespace OpenTelemetry {
 
 class OpenTelemetryConstantValues {
 public:
-  const Tracing::TraceContextHandler TRACE_PARENT{"traceparent"};
-  const Tracing::TraceContextHandler TRACE_STATE{"tracestate"};
+  const Tracing::TraceContextHandler TRACE_PARENT{"x-sendbird-traceparent"};
+  const Tracing::TraceContextHandler TRACE_STATE{"x-sendbird-tracestate"};
 };
 
 using OpenTelemetryConstants = ConstSingleton<OpenTelemetryConstantValues>;

diff --git a/source/extensions/tracers/opentelemetry/tracer.cc b/source/extensions/tracers/opentelemetry/tracer.cc
@@ -26,11 +26,11 @@ using opentelemetry::proto::collector::trace::v1::ExportTraceServiceRequest;
 namespace {
 
 const Tracing::TraceContextHandler& traceParentHeader() {
-  CONSTRUCT_ON_FIRST_USE(Tracing::TraceContextHandler, "traceparent");
+  CONSTRUCT_ON_FIRST_USE(Tracing::TraceContextHandler, "x-sendbird-traceparent");
 }
 
 const Tracing::TraceContextHandler& traceStateHeader() {
-  CONSTRUCT_ON_FIRST_USE(Tracing::TraceContextHandler, "tracestate");
+  CONSTRUCT_ON_FIRST_USE(Tracing::TraceContextHandler, "x-sendbird-tracestate");
 }
 
 void callSampler(SamplerSharedPtr sampler, const absl::optional<SpanContext> span_context,

diff --git a/test/extensions/clusters/redis/redis_cluster_lb_test.cc b/test/extensions/clusters/redis/redis_cluster_lb_test.cc
@@ -561,6 +561,31 @@ TEST_F(RedisLoadBalancerContextImplTest, EnforceHashTag) {
   EXPECT_EQ(NetworkFilters::Common::Redis::Client::ReadPolicy::Primary, context2.readPolicy());
 }
 
+TEST_F(RedisLoadBalancerContextImplTest, ReadOnlyCommand) {
+  std::vector<NetworkFilters::Common::Redis::RespValue> eval_ro_foo(4);
+  eval_ro_foo[0].type(NetworkFilters::Common::Redis::RespType::BulkString);
+  eval_ro_foo[0].asString() = "eval_ro";
+  eval_ro_foo[1].type(NetworkFilters::Common::Redis::RespType::BulkString);
+  eval_ro_foo[1].asString() = "return {KEYS[1]}";
+  eval_ro_foo[2].type(NetworkFilters::Common::Redis::RespType::BulkString);
+  eval_ro_foo[2].asString() = "foo";
+  eval_ro_foo[3].type(NetworkFilters::Common::Redis::RespType::BulkString);
+  eval_ro_foo[3].asString() = "0";
+
+  NetworkFilters::Common::Redis::RespValue eval_ro_request;
+  eval_ro_request.type(NetworkFilters::Common::Redis::RespType::Array);
+  eval_ro_request.asArray().swap(eval_ro_foo);
+
+  RedisLoadBalancerContextImpl context1(
+      "foo", true, true, eval_ro_request,
+      NetworkFilters::Common::Redis::Client::ReadPolicy::PreferReplica);
+
+  EXPECT_EQ(absl::optional<uint64_t>(44950), context1.computeHashKey());
+  EXPECT_EQ(true, context1.isReadCommand());
+  EXPECT_EQ(NetworkFilters::Common::Redis::Client::ReadPolicy::PreferReplica,
+            context1.readPolicy());
+}
+
 } // namespace Redis
 } // namespace Clusters
 } // namespace Extensions

diff --git a/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc b/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc
@@ -491,6 +491,50 @@ TEST_F(RedisSingleServerRequestTest, EvalShaSuccess) {
             store_.counter(fmt::format("redis.foo.command.{}.success", lower_command)).value());
 };
 
+TEST_F(RedisSingleServerRequestTest, EvalRoSuccess) {
+  InSequence s;
+
+  Common::Redis::RespValuePtr request{new Common::Redis::RespValue()};
+  makeBulkStringArray(*request, {"eval_ro", "return {ARGV[1]}", "1", "key", "arg"});
+  makeRequest("key", std::move(request));
+  EXPECT_NE(nullptr, handle_);
+
+  std::string lower_command = absl::AsciiStrToLower("eval_ro");
+
+  time_system_.setMonotonicTime(std::chrono::milliseconds(10));
+  EXPECT_CALL(store_, deliverHistogramToSinks(
+                          Property(&Stats::Metric::name,
+                                   fmt::format("redis.foo.command.{}.latency", lower_command)),
+                          10));
+  respond();
+
+  EXPECT_EQ(1UL, store_.counter(fmt::format("redis.foo.command.{}.total", lower_command)).value());
+  EXPECT_EQ(1UL,
+            store_.counter(fmt::format("redis.foo.command.{}.success", lower_command)).value());
+};
+
+TEST_F(RedisSingleServerRequestTest, EvalShaRoSuccess) {
+  InSequence s;
+
+  Common::Redis::RespValuePtr request{new Common::Redis::RespValue()};
+  makeBulkStringArray(*request, {"EVALSHA_RO", "return {ARGV[1]}", "1", "keykey", "arg"});
+  makeRequest("keykey", std::move(request));
+  EXPECT_NE(nullptr, handle_);
+
+  std::string lower_command = absl::AsciiStrToLower("evalsha_ro");
+
+  time_system_.setMonotonicTime(std::chrono::milliseconds(10));
+  EXPECT_CALL(store_, deliverHistogramToSinks(
+                          Property(&Stats::Metric::name,
+                                   fmt::format("redis.foo.command.{}.latency", lower_command)),
+                          10));
+  respond();
+
+  EXPECT_EQ(1UL, store_.counter(fmt::format("redis.foo.command.{}.total", lower_command)).value());
+  EXPECT_EQ(1UL,
+            store_.counter(fmt::format("redis.foo.command.{}.success", lower_command)).value());
+};
+
 TEST_F(RedisSingleServerRequestTest, EvalWrongNumberOfArgs) {
   InSequence s;