Merge branch 'beta-12.5' into dev-proxy2

.github/workflows/beta-tag.yml

@@ -2,7 +2,8 @@ name: Beta
 on:
   push:
     tags:
-      - v12.1.beta.*
+      - v*.beta.*
+      - v*.RC.*
 env:
   TAG: ${{ github.ref_name }}
 jobs:

.github/workflows/maven_java-lib.yml

@@ -0,0 +1,33 @@
+name: Java CI with Maven with custom Java-lib
+
+on:
+  push:
+    branches: ["**"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: ["11"]
+        # java: ["11", "16", "17"]
+
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout Java-lib Repository
+        with:
+          ref: dev-proxy2
+          repository: wavefrontHQ/java-lib
+      - name: Build Java-lib
+        run: mvn --batch-mode install
+      - uses: actions/checkout@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: "temurin"
+          cache: maven
+      - name: Check code format
+        run: mvn -f proxy git-code-format:validate-code-format
+      - name: Build with Maven
+        run: mvn -f proxy test -B

proxy/pom.xml

@@ -105,6 +105,21 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M7</version>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit47</artifactId>
+            <version>3.0.0-M7</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <!-- <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.0.0-M5</version>
@@ -114,18 +129,14 @@
           <argLine>${jacocoArgLine} -Xmx512m -Duser.country=US</argLine>
           <rerunFailingTestsCount>3</rerunFailingTestsCount>
           <systemProperties>
-            <property>
-              <name>java.util.logging.manager</name>
-              <value>org.apache.logging.log4j.jul.LogManager</value>
-            </property>
             <property>
               <name>log4j.configurationFile</name>
               <value>src/test/resources/log4j2-dev.xml</value>
             </property>
           </systemProperties>
         </configuration>
-      </plugin>
-      <plugin>
+      </plugin> -->
+      <!-- <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
         <version>0.8.3</version>
@@ -224,7 +235,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin> -->
 
       <plugin>
         <groupId>org.springframework.boot</groupId>
@@ -316,12 +327,6 @@
         <artifactId>joda-time</artifactId>
         <version>2.10.14</version>
       </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13.2</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
@@ -378,6 +383,12 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>

proxy/src/test/java/com/wavefront/agent/HttpEndToEndTest.java

@@ -43,7 +43,7 @@
 public class HttpEndToEndTest {
   private static final Logger logger = LoggerFactory.getLogger("test");
 
-  public static int HTTP_timeout_tests = 1000;
+  public static int HTTP_timeout_tests = 10000;
 
   private static PushAgent proxy;
   private static MutableFunc<FullHttpRequest, HttpResponse> server = new MutableFunc<>(x -> null);