Apply spotless.

Author: zzhlogin

.github/workflows/docker-build-smoke-tests-fake-backend.yml

@@ -1,8 +1,5 @@
 name: Smoke test build
 on:
-  pull_request:
-    branches:
-      - main
   push:
     branches:
       - main

.github/workflows/main-build.yml

@@ -4,7 +4,6 @@ on:
     branches:
       - main
       - "release/v*"
-      - test_upgrade_only_v2
 env:
   AWS_DEFAULT_REGION: us-east-1
   STAGING_ECR_REGISTRY: 611364707713.dkr.ecr.us-west-2.amazonaws.com

.github/workflows/nightly-upstream-snapshot-build.yml

@@ -1,8 +1,5 @@
 name: Nightly Snapshot Build
 on:
-  pull_request:
-    branches:
-      - main
   schedule:
     - cron: "21 3 * * *"
   workflow_dispatch:

.github/workflows/release-build.yml

@@ -94,36 +94,36 @@ jobs:
       - name: Test docker image
         shell: bash
         run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ github.event.inputs.version }}"
-#
-#      - name: Build and push image
-#        uses: docker/build-push-action@v5
-#        with:
-#          push: true
-#          build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
-#          context: .
-#          platforms: linux/amd64,linux/arm64
-#          tags: |
-#            ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
-#            ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
-#
-#      - name: Build and Publish release with Gradle
-#        uses: gradle/gradle-build-action@v3
-#        with:
-#          arguments: build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
-#        env:
-#          PUBLISH_TOKEN_USERNAME: ${{ secrets.PUBLISH_TOKEN_USERNAME }}
-#          PUBLISH_TOKEN_PASSWORD: ${{ secrets.PUBLISH_TOKEN_PASSWORD }}
-#          GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
-#          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-#          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-#
-#      - name: Create release
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-#        run: |
-#          cp "otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" aws-opentelemetry-agent.jar
-#          gh release create --target "$GITHUB_REF_NAME" \
-#             --title "Release v${{ github.event.inputs.version }}" \
-#             --draft \
-#             "v${{ github.event.inputs.version }}" \
-#             aws-opentelemetry-agent.jar
+
+      - name: Build and push image
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
+          context: .
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
+            ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
+
+      - name: Build and Publish release with Gradle
+        uses: gradle/gradle-build-action@v3
+        with:
+          arguments: build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
+        env:
+          PUBLISH_TOKEN_USERNAME: ${{ secrets.PUBLISH_TOKEN_USERNAME }}
+          PUBLISH_TOKEN_PASSWORD: ${{ secrets.PUBLISH_TOKEN_PASSWORD }}
+          GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+
+      - name: Create release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        run: |
+          cp "otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" aws-opentelemetry-agent.jar
+          gh release create --target "$GITHUB_REF_NAME" \
+             --title "Release v${{ github.event.inputs.version }}" \
+             --draft \
+             "v${{ github.event.inputs.version }}" \
+             aws-opentelemetry-agent.jar

appsignals-tests/contract-tests/build.gradle.kts

@@ -73,11 +73,6 @@ tasks {
       "-Dio.awsobservability.instrumentation.contracttests.agentPath=${otelAgentJarTask.get().archiveFile.get()
         .getAsFile().absolutePath}",
     )
-
-    testLogging {
-      events("passed", "skipped", "failed")
-      showStandardStreams = true
-    }
   }
 
   // Disable the test task from the java plugin

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/base/JMXMetricsContractTestBase.java

@@ -22,22 +22,9 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import software.amazon.opentelemetry.appsignals.test.utils.JMXMetricsConstants;
 
 public abstract class JMXMetricsContractTestBase extends ContractTestBase {
-  protected static final Logger LOGGER =
-      Logger.getLogger(JMXMetricsContractTestBase.class.getName());
-
-  static {
-    ConsoleHandler handler = new ConsoleHandler();
-    handler.setLevel(Level.INFO);
-    LOGGER.addHandler(handler);
-    LOGGER.setLevel(Level.INFO);
-    LOGGER.setUseParentHandlers(false);
-  }
 
   @Override
   protected Map<String, String> getApplicationEnvironmentVariables() {
@@ -63,15 +50,7 @@ protected void assertMetrics() {
     var metrics = mockCollectorClient.getRuntimeMetrics(getExpectedMetrics());
     metrics.forEach(
         metric -> {
-          var metricName = metric.getMetric().getName();
-          long threshold = getThreshold(metricName);
           var dataPoints = metric.getMetric().getGauge().getDataPointsList();
-          dataPoints.forEach(
-              dp ->
-                  LOGGER.info(
-                      String.format(
-                          "Debug tomocat tests assertMetrics here !!!!: Data Point - Metric name: %s, Value: %d, Threshold: %d",
-                          metricName, dp.getAsInt(), threshold)));
           assertGreaterThanOrEqual(dataPoints, getThreshold(metric.getMetric().getName()));
         });
   }
@@ -83,6 +62,7 @@ protected long getThreshold(String metricName) {
     switch (metricName) {
         // If maximum memory size is undefined, then value is -1
         // https://docs.oracle.com/en/java/javase/17/docs/api/java.management/java/lang/management/MemoryUsage.html#getMax()
+        // TODO: Figure out why tomcat thread counts can be negative.
       case JMXMetricsConstants.TOMCAT_THREADS:
         threshold = -3;
         break;