Update submodule (#1916)

* Update submodule

* Try to fix one branch build

* Fix sporadic test failure

* Fix another sporadic failure

* Metaspace

Author: trask

.pipelines/pipeline.user.windows.yml

@@ -38,19 +38,16 @@ restore:
     - !!defaultcommand
       name: 'Install Java 11 JDK'
       command: '.scripts/installJava11jdk.cmd'
-    - !!defaultcommand
-      name: 'Add OpenTelemetry to MavenLocal (pre-1)'
-      command: '.scripts/ot-gradle.cmd'
-      arguments: '--project-dir gradle-plugins publishToMavenLocal'
-    - !!defaultcommand
-      name: 'Add OpenTelemetry to MavenLocal (pre-2)'
-      command: '.scripts/ot-gradle.cmd'
-      arguments: ':muzzle:publishToMavenLocal'
     - !!defaultcommand
       name: 'Add OpenTelemetry to MavenLocal'
       command: '.scripts/ot-gradle.cmd'
       # javadoc fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
       arguments: 'publishToMavenLocal -x javadoc'
+      # if connection reset issue continues, try:
+      #   -P org.gradle.internal.http.connectionTimeout=30000
+      #   -P org.gradle.internal.http.socketTimeout=30000
+      #   -P org.gradle.internal.repository.max.retries=10
+      #   -P org.gradle.internal.repository.initial.backoff=500
     - !!defaultcommand
       name: 'Download Dependencies'
       command: '.scripts/gradle.cmd'

.scripts/ot-gradle.cmd

@@ -11,6 +11,8 @@ set PROJECT_ROOT=%CD%\otel
 pushd %PROJECT_ROOT%
 
 set DEFAULT_OPTIONS=--info --stacktrace --warning-mode=all
+rem one branch build has been getting sporadic metaspace out of memory errors 
+set GRADLE_OPTS=-XX:MaxMetaspaceSize=768m
 set GRADLE_CMD=gradlew.bat %DEFAULT_OPTIONS% %*
 echo Running '%GRADLE_CMD%' in '%PROJECT_ROOT%'
 call %GRADLE_CMD%

gradle.properties

@@ -1,3 +1,6 @@
 // Project properties
 version=3.2.1-BETA
-group=com.microsoft.azure
+group=com.microsoft.azure
+
+# gradle default is 256m which causes sporadic failures - https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m

otel

@@ -188,7 +188,6 @@ protected static void stopContainer(ContainerInfo info) throws Exception {
   protected String httpMethod;
   protected long targetUriDelayMs;
   protected long targetUriCallCount;
-  protected long targetUriTimeoutMs;
   // endregion
 
   // region: options
@@ -220,7 +219,6 @@ protected void starting(Description description) {
             thiz.httpMethod = null;
             thiz.targetUriDelayMs = 0L;
             thiz.targetUriCallCount = 1;
-            thiz.targetUriTimeoutMs = TELEMETRY_RECEIVE_TIMEOUT_SECONDS * 1000;
           } else {
             thiz.targetUri = targetUri.value();
             if (!thiz.targetUri.startsWith("/")) {
@@ -229,10 +227,6 @@ protected void starting(Description description) {
             thiz.httpMethod = targetUri.method().toUpperCase();
             thiz.targetUriDelayMs = targetUri.delay();
             thiz.targetUriCallCount = targetUri.callCount();
-            thiz.targetUriTimeoutMs =
-                targetUri.timeout() > 0
-                    ? targetUri.timeout()
-                    : TELEMETRY_RECEIVE_TIMEOUT_SECONDS * 1000;
           }
         }
 
@@ -491,12 +485,10 @@ protected void callTargetUriAndWaitForTelemetry() throws Exception {
           String.format("Empty response from targetUri: '%s'. %s", targetUri, expectationMessage),
           content.length() > 0);
     }
-    if (this.targetUriTimeoutMs > 0) {
-      Stopwatch sw = Stopwatch.createStarted();
-      mockedIngestion.awaitAnyItems(this.targetUriTimeoutMs, TimeUnit.MILLISECONDS);
-      System.out.printf(
-          "Telemetry received after %.3f seconds.%n", sw.elapsed(TimeUnit.MILLISECONDS) / 1000.0);
-    }
+    Stopwatch sw = Stopwatch.createStarted();
+    mockedIngestion.awaitAnyItems(TELEMETRY_RECEIVE_TIMEOUT_SECONDS * 1000, TimeUnit.MILLISECONDS);
+    System.out.printf(
+        "Telemetry received after %.3f seconds.%n", sw.elapsed(TimeUnit.MILLISECONDS) / 1000.0);
     System.out.println("Starting validation...");
     assertTrue("mocked ingestion has no data", mockedIngestion.hasData());
   }

test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/AiSmokeTest.java

@@ -38,7 +38,4 @@
 
   /** The number of times to call the target uri. */
   int callCount() default 1;
-
-  /** The number of milliseconds to wait for a response. */
-  long timeout() default 0L;
 }

test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/TargetUri.java

@@ -412,19 +412,15 @@ public void testAutoFailedRequestWithResultCode() throws Exception {
   }
 
   @Test
-  @TargetUri(
-      value = "/requestSlow?sleeptime=25",
-      timeout = 35_000) // the servlet sleeps for 25 seconds
+  @TargetUri("/requestSlow?sleeptime=20")
   public void testRequestSlowWithResponseTime() throws Exception {
-    validateSlowTest(25, "GET /CoreAndFilter/requestSlow");
+    validateSlowTest(20, "GET /CoreAndFilter/requestSlow");
   }
 
   @Test
-  @TargetUri(
-      value = "/slowLoop?responseTime=25",
-      timeout = 35_000) // the servlet sleeps for 20 seconds
+  @TargetUri("/slowLoop?responseTime=20")
   public void testSlowRequestUsingCpuBoundLoop() throws Exception {
-    validateSlowTest(25, "GET /CoreAndFilter/slowLoop");
+    validateSlowTest(20, "GET /CoreAndFilter/slowLoop");
   }
 
   @Test