From ae66cc17f847b63143cd4c70efa81719d47a02f3 Mon Sep 17 00:00:00 2001
From: kaiqianyang <kaiqianyang@microsoftcom>
Date: Thu, 26 Oct 2023 21:36:32 +0800
Subject: [PATCH] move zipkin to rules-overridden-azure tech-usage

---
 .../embedded-framework.windup.xml             | 31 +++++++++++-
 ...rk-target-azure-appservice.windup.test.xml | 10 ++++
 ...framework-target-discovery.windup.test.xml | 11 +++++
 .../spring-boot-to-azure-zipkin.windup.xml    | 43 ----------------
 .../data/spring-boot-to-azure-zipkin/pom.xml  | 49 -------------------
 ...pring-boot-to-azure-zipkin.windup.test.xml | 24 ---------
 6 files changed, 51 insertions(+), 117 deletions(-)
 delete mode 100644 rules/rules-reviewed/azure/springboot/spring-boot-to-azure-zipkin.windup.xml
 delete mode 100644 rules/rules-reviewed/azure/springboot/tests/data/spring-boot-to-azure-zipkin/pom.xml
 delete mode 100644 rules/rules-reviewed/azure/springboot/tests/spring-boot-to-azure-zipkin.windup.test.xml

diff --git a/rules/rules-overridden-azure/technology-usage/embedded-framework.windup.xml b/rules/rules-overridden-azure/technology-usage/embedded-framework.windup.xml
index d0d4e0cc..971a7b36 100644
--- a/rules/rules-overridden-azure/technology-usage/embedded-framework.windup.xml
+++ b/rules/rules-overridden-azure/technology-usage/embedded-framework.windup.xml
@@ -32,7 +32,7 @@
                 </or>
             </when>
             <perform>
-                <hint  title="Embedded framework - Feign" category-id="information" effort="0">
+                <hint title="Embedded framework - Feign" category-id="information" effort="0">
                     <message>
                         The application embeds the Feign framework. If you are migrating to Azure Spring Apps, it is recommended to use Spring Cloud OpenFeign instead (Spring Cloud Feign has been deprecated).
                         
@@ -44,6 +44,35 @@
                 <technology-tag level="INFORMATIONAL">Feign</technology-tag>
             </perform>
         </rule>
+        <rule id="embedded-framework-09100">
+            <when>
+                <or>
+                    <file filename="{*}zipkin{*}.jar"/>
+                    <project>
+                        <artifact groupId="org.springframework.boot" artifactId="spring-cloud-starter-zipkin"/>
+                    </project>
+                    <project>
+                        <artifact groupId="io.zipkin{*}" artifactId="{*}"/>
+                    </project>
+                </or>
+            </when>
+            <perform>
+                <hint title="Embedded framework - Zipkin" category-id="information" effort="0">
+                    <message>
+                        The application embeds the Zipkin framework. To migrate a Java application that uses Zipkin to Azure, it is recommended to use Azure Monitor instead.
+                        
+                        * **Identify Zipkin dependencies**: Identify the Zipkin dependencies in your application.
+
+                        * **Replace with Azure Monitor**: Azure Monitor provides distributed tracing capabilities. Azure services such as Azure Spring Apps, Azure Kubernetes Service, Azure App Service support auto-instrumentation for Azure Monitor.
+                    </message>
+                    <link title="Azure Monitor" href="https://learn.microsoft.com/azure/azure-monitor/"/>
+                    <link title="Spring Boot to Azure - identify Zipkin dependencies" href="https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-cloud-to-azure-spring-apps?pivots=sc-standard-tier#identify-zipkin-dependencies"/>
+                    <link title="Use Application Insights Java In-Process Agent in Azure Spring Apps" href="https://learn.microsoft.com/azure/spring-apps/how-to-application-insights"/>
+                    <link title="Distributed Tracing" href="https://learn.microsoft.com/azure/azure-monitor/app/distributed-trace-data"/>
+                </hint>
+                <technology-tag level="INFORMATIONAL">Zipkin</technology-tag>
+            </perform>
+        </rule>
         <rule id="embedded-framework-09300">
             <when>
                 <or>
diff --git a/rules/rules-overridden-azure/technology-usage/tests/embedded-framework-target-azure-appservice.windup.test.xml b/rules/rules-overridden-azure/technology-usage/tests/embedded-framework-target-azure-appservice.windup.test.xml
index 5b375f47..6a1e6d3e 100644
--- a/rules/rules-overridden-azure/technology-usage/tests/embedded-framework-target-azure-appservice.windup.test.xml
+++ b/rules/rules-overridden-azure/technology-usage/tests/embedded-framework-target-azure-appservice.windup.test.xml
@@ -19,6 +19,16 @@
                     <fail message="Feign found hint was not found!"/>
                 </perform>
             </rule>
+            <rule id="embedded-framework-azure-appservice-test-09100">
+                <when>
+                    <not>
+                        <hint-exists message="The application embeds the Zipkin framework. To migrate a Java application that uses Zipkin to Azure"/>
+                    </not>
+                </when>
+                <perform>
+                    <fail message="Zipkin found hint was not found!"/>
+                </perform>
+            </rule>
             <rule id="embedded-framework-azure-appservice-test-09300">
                 <when>
                     <not>
diff --git a/rules/rules-overridden-azure/technology-usage/tests/embedded-framework-target-discovery.windup.test.xml b/rules/rules-overridden-azure/technology-usage/tests/embedded-framework-target-discovery.windup.test.xml
index efd7b56d..aac56548 100644
--- a/rules/rules-overridden-azure/technology-usage/tests/embedded-framework-target-discovery.windup.test.xml
+++ b/rules/rules-overridden-azure/technology-usage/tests/embedded-framework-target-discovery.windup.test.xml
@@ -20,6 +20,17 @@
                     <fail message="Expected data not found for rule embedded-framework-09000"/>
                 </perform>
             </rule>
+            <rule id="embedded-framework-09100-test">
+            <when>
+               <not>
+                  <classification-exists classification="Embedded framework - Zipkin"/>
+                  <technology-tag-exists technology-tag="Zipkin"/>
+               </not>
+            </when>
+            <perform>
+               <fail message="Expected data not found for rule embedded-framework-09100"/>
+            </perform>
+         </rule>
             <rule id="embedded-framework-09300-test">
                 <when>
                     <not>
diff --git a/rules/rules-reviewed/azure/springboot/spring-boot-to-azure-zipkin.windup.xml b/rules/rules-reviewed/azure/springboot/spring-boot-to-azure-zipkin.windup.xml
deleted file mode 100644
index 12a3abc3..00000000
--- a/rules/rules-reviewed/azure/springboot/spring-boot-to-azure-zipkin.windup.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset id="spring-boot-to-azure-zipkin"
-         xmlns="http://windup.jboss.org/schema/jboss-ruleset"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd">
-    <metadata>
-        <description>
-            Identify Zipkin dependencies.
-        </description>
-        <dependencies>
-            <addon id="org.jboss.windup.rules,windup-rules-xml,3.0.0.Final"/>
-        </dependencies>
-        <sourceTechnology id="springboot"/>
-        <targetTechnology id="azure-spring-apps"/>
-        <targetTechnology id="azure-aks"/>
-        <targetTechnology id="azure-appservice"/>
-        <targetTechnology id="azure-container-apps"/>
-        <tag>zipkin</tag>
-    </metadata>
-    <rules>
-        <rule id="spring-boot-to-azure-zipkin-01000">
-            <when>
-                <or>
-                    <project>
-                        <artifact groupId="org.springframework.boot" artifactId="spring-cloud-starter-zipkin"/>
-                    </project>
-                    <project>
-                        <artifact groupId="io.zipkin{*}" artifactId="{*}"/>
-                    </project>
-                </or>
-            </when>
-            <perform>
-                <hint title="Zipkin" category-id="information" effort="0">
-                    <message>
-                        The application uses Zipkin.
-                    </message>
-                    <link title="Spring Boot to Azure - identify Zipkin dependencies" href="https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-cloud-to-azure-spring-apps?pivots=sc-standard-tier#identify-zipkin-dependencies"/>
-                    <link title="Distributed Tracing" href="https://learn.microsoft.com/azure/azure-monitor/app/distributed-tracing-telemetry-correlation"/>
-                </hint>
-            </perform>
-        </rule>
-    </rules>
-</ruleset>
diff --git a/rules/rules-reviewed/azure/springboot/tests/data/spring-boot-to-azure-zipkin/pom.xml b/rules/rules-reviewed/azure/springboot/tests/data/spring-boot-to-azure-zipkin/pom.xml
deleted file mode 100644
index c67f87fa..00000000
--- a/rules/rules-reviewed/azure/springboot/tests/data/spring-boot-to-azure-zipkin/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.jboss.windup.rules.test</groupId>
-    <artifactId>spring-boot-to-azure-zipkin</artifactId>
-    <version>4.2.1_SNAPSHOT</version>
-    <name>Identify Zipkin dependencies</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.zipkin.java</groupId>
-            <artifactId>zipkin-server</artifactId>
-            <version>5.0.10.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>io.zipkin.conf</groupId>
-            <artifactId>zipkin-autoconfigure-ui</artifactId>
-            <version>5.0.10.Final</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.zipkin</groupId>
-            <artifactId>zipkin-server</artifactId>
-            <version>5.0.10.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>not-tested</groupId>
-            <artifactId>zipkin-autoconfigure-ui</artifactId>
-            <version>5.0.10.Final</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-            <version>5.0.10.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>not-tested</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-            <version>5.0.10.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>not-tested</artifactId>
-            <version>5.0.10.Final</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/rules/rules-reviewed/azure/springboot/tests/spring-boot-to-azure-zipkin.windup.test.xml b/rules/rules-reviewed/azure/springboot/tests/spring-boot-to-azure-zipkin.windup.test.xml
deleted file mode 100644
index ca0fc7e4..00000000
--- a/rules/rules-reviewed/azure/springboot/tests/spring-boot-to-azure-zipkin.windup.test.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruletest id="spring-boot-to-azure-zipkin-test"
-          xmlns="http://windup.jboss.org/schema/jboss-ruleset"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd">
-    <testDataPath>data/spring-boot-to-azure-zipkin</testDataPath>
-    <rulePath>../spring-boot-to-azure-zipkin.windup.xml</rulePath>
-    <ruleset>
-        <rules>
-            <rule id="spring-boot-to-azure-zipkin-test-01000">
-                <when>
-                    <not>
-                        <iterable-filter size="4">
-                            <hint-exists message="The application uses Zipkin."/>
-                        </iterable-filter>
-                    </not>
-                </when>
-                <perform>
-                    <fail message="Zipkin hint was not found!"/>
-                </perform>
-            </rule>
-        </rules>
-    </ruleset>
-</ruletest>
\ No newline at end of file