From f886a7b532f8980091808b2af7011fc787d32a61 Mon Sep 17 00:00:00 2001
From: Giorgos Bamparopoulos <georgios.bamparopoulos@elastic.co>
Date: Tue, 1 Mar 2022 17:36:42 +0000
Subject: [PATCH] [APM] Remove beta badge for AWS lambda (#126596)

* Remove beta badge for AWS lambda
---
 .../shared/service_icons/cloud_details.tsx    | 35 ++-----------------
 .../translations/translations/ja-JP.json      |  2 --
 .../translations/translations/zh-CN.json      |  2 --
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx
index 91780fec158450..b5e4013d08ecb6 100644
--- a/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx
@@ -5,13 +5,7 @@
  * 2.0.
  */
 
-import {
-  EuiBadge,
-  EuiDescriptionList,
-  EuiBetaBadge,
-  EuiFlexGroup,
-  EuiFlexItem,
-} from '@elastic/eui';
+import { EuiBadge, EuiDescriptionList } from '@elastic/eui';
 import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
@@ -51,32 +45,7 @@ export function CloudDetails({ cloud, isServerless }: Props) {
           defaultMessage: 'Cloud service',
         }
       ),
-      description: (
-        <EuiFlexGroup alignItems="center" gutterSize="xs">
-          <EuiFlexItem grow={false}>{cloud.serviceName}</EuiFlexItem>
-          {isServerless && (
-            <EuiFlexItem grow={false}>
-              <EuiBetaBadge
-                label={i18n.translate(
-                  'xpack.apm.serviceIcons.serviceDetails.cloud.betaLabel',
-                  {
-                    defaultMessage: 'Beta',
-                  }
-                )}
-                tooltipContent={i18n.translate(
-                  'xpack.apm.serviceIcons.serviceDetails.cloud.betaTooltip',
-                  {
-                    defaultMessage:
-                      'AWS Lambda support is not GA. Please help us by reporting bugs.',
-                  }
-                )}
-                size="s"
-                iconType="beaker"
-              />
-            </EuiFlexItem>
-          )}
-        </EuiFlexGroup>
-      ),
+      description: cloud.serviceName,
     });
   }
 
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 2b1aeea6e4f7d1..263a760a9d797b 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7295,8 +7295,6 @@
     "xpack.apm.serviceIcons.serverless": "サーバーレス",
     "xpack.apm.serviceIcons.service": "サービス",
     "xpack.apm.serviceIcons.serviceDetails.cloud.availabilityZoneLabel": "{zones, plural, other {可用性ゾーン}} ",
-    "xpack.apm.serviceIcons.serviceDetails.cloud.betaLabel": "ベータ",
-    "xpack.apm.serviceIcons.serviceDetails.cloud.betaTooltip": "AWS Lambdaサポートは一般公開されていません。不具合を報告して支援してください。",
     "xpack.apm.serviceIcons.serviceDetails.cloud.faasTriggerTypeLabel": "{triggerTypes, plural, other  {トリガータイプ}} ",
     "xpack.apm.serviceIcons.serviceDetails.cloud.functionNameLabel": "{functionNames, plural, other  {関数名}} ",
     "xpack.apm.serviceIcons.serviceDetails.cloud.machineTypesLabel": "{machineTypes, plural, other {コンピュータータイプ} }\n ",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index bfb22faf1316b2..a3a5ba1a83dc65 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7312,8 +7312,6 @@
     "xpack.apm.serviceIcons.serverless": "无服务器",
     "xpack.apm.serviceIcons.service": "服务",
     "xpack.apm.serviceIcons.serviceDetails.cloud.availabilityZoneLabel": "{zones, plural, other {可用性区域}} ",
-    "xpack.apm.serviceIcons.serviceDetails.cloud.betaLabel": "公测版",
-    "xpack.apm.serviceIcons.serviceDetails.cloud.betaTooltip": "AWS Lambda 支持不是 GA 版。请通过报告错误来帮助我们。",
     "xpack.apm.serviceIcons.serviceDetails.cloud.faasTriggerTypeLabel": "{triggerTypes, plural, other {触发类型}} ",
     "xpack.apm.serviceIcons.serviceDetails.cloud.functionNameLabel": "{functionNames, plural, other {功能名称}} ",
     "xpack.apm.serviceIcons.serviceDetails.cloud.machineTypesLabel": "{machineTypes, plural, other {机器类型}} ",