Merge branch 'main' into thpierce-patch-2

Author: thpierce

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

@@ -60,10 +60,10 @@ protected void assertMetrics() {
   protected long getThreshold(String metricName) {
     long threshold = 0;
     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()
-        // Thread count can be negative when excutor is null
-        // https://github.com/apache/tomcat/blob/1afe41491f0e56ec0a776db5ff84607f87ce6640/java/org/apache/tomcat/util/net/AbstractEndpoint.java#L1204
+      // 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()
+      // Thread count can be negative when excutor is null
+      // https://github.com/apache/tomcat/blob/1afe41491f0e56ec0a776db5ff84607f87ce6640/java/org/apache/tomcat/util/net/AbstractEndpoint.java#L1204
       case JMXMetricsConstants.TOMCAT_THREADS:
         threshold = -2;
         break;

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java

@@ -455,17 +455,17 @@ private static String normalizeRemoteServiceName(SpanData span, String serviceNa
         case "AmazonSQS": // AWS SDK v1
         case "Sqs": // AWS SDK v2
           return NORMALIZED_SQS_SERVICE_NAME;
-          // For Bedrock, Bedrock Agent, and Bedrock Agent Runtime, we can align with AWS Cloud
-          // Control and use AWS::Bedrock for RemoteService.
+        // For Bedrock, Bedrock Agent, and Bedrock Agent Runtime, we can align with AWS Cloud
+        // Control and use AWS::Bedrock for RemoteService.
         case "AmazonBedrock": // AWS SDK v1
         case "Bedrock": // AWS SDK v2
         case "AWSBedrockAgentRuntime": // AWS SDK v1
         case "BedrockAgentRuntime": // AWS SDK v2
         case "AWSBedrockAgent": // AWS SDK v1
         case "BedrockAgent": // AWS SDK v2
           return NORMALIZED_BEDROCK_SERVICE_NAME;
-          // For BedrockRuntime, we are using AWS::BedrockRuntime as the associated remote resource
-          // (Model) is not listed in Cloud Control.
+        // For BedrockRuntime, we are using AWS::BedrockRuntime as the associated remote resource
+        // (Model) is not listed in Cloud Control.
         case "AmazonBedrockRuntime": // AWS SDK v1
         case "BedrockRuntime": // AWS SDK v2
           return NORMALIZED_BEDROCK_RUNTIME_SERVICE_NAME;

settings.gradle.kts

@@ -15,7 +15,7 @@
 
 pluginManagement {
   plugins {
-    id("com.diffplug.spotless") version "6.25.0"
+    id("com.diffplug.spotless") version "7.0.3"
     id("com.github.ben-manes.versions") version "0.50.0"
     id("com.github.jk1.dependency-license-report") version "2.5"
     id("com.gradleup.shadow") version "8.3.5"