From bd32ea0d1dda9d93085866159df90e967b59aaf2 Mon Sep 17 00:00:00 2001
From: Felix Barnsteiner <felix.barnsteiner@elastic.co>
Date: Tue, 18 Jan 2022 10:27:44 +0100
Subject: [PATCH] Fix profile activation for non-apple silicon

Relying on <activeByDefault>true</activeByDefault>
does not work when a profile, such as the IntelliJ profile is active
---
 apm-agent-plugins/apm-grpc/pom.xml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/apm-agent-plugins/apm-grpc/pom.xml b/apm-agent-plugins/apm-grpc/pom.xml
index 8b308405b7..bbddcfcb44 100644
--- a/apm-agent-plugins/apm-grpc/pom.xml
+++ b/apm-agent-plugins/apm-grpc/pom.xml
@@ -40,10 +40,29 @@
 
     <profiles>
         <profile>
-            <id>default</id>
+            <id>non-mac</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <os>
+                    <family>!mac</family>
+                </os>
+            </activation>
+            <!-- Keep in sync with mac-non-apple-silicon profile -->
+            <modules>
+                <module>apm-grpc-plugin</module>
+                <module>apm-grpc-test-1.6.1</module>
+                <!-- other intermediate gRPC versions that have been tested : 1.7.1, 1,9.1, 1.13.2, 1.22.0, 1.23.0, 1.27.1 -->
+                <module>apm-grpc-test-latest</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>mac-non-apple-silicon</id>
+            <activation>
+                <os>
+                    <family>mac</family>
+                    <arch>!aarch64</arch>
+                </os>
             </activation>
+            <!-- Keep in sync with non-mac profile -->
             <modules>
                 <module>apm-grpc-plugin</module>
                 <module>apm-grpc-test-1.6.1</module>
@@ -56,7 +75,7 @@
             Old grpc/protobuf compilers don't support mac aarch64 (Apple Silicon, such as M1)
             Therefore, excluding apm-grpc-test-1.6.1
             -->
-            <id>apple-silicon</id>
+            <id>mac-apple-silicon</id>
             <activation>
                 <os>
                     <family>mac</family>