Changes before error encountered

Co-authored-by: trask <[email protected]>

Author: Copilot

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsAttributeKeys.java

@@ -12,8 +12,6 @@
 /** Utility class holding attribute keys with special meaning to AWS components */
 final class AwsAttributeKeys {
 
-  private AwsAttributeKeys() {}
-
   static final AttributeKey<String> AWS_SPAN_KIND = stringKey("aws.span.kind");
 
   static final AttributeKey<String> AWS_LOCAL_SERVICE = stringKey("aws.local.service");
@@ -35,4 +33,6 @@ private AwsAttributeKeys() {}
   static final AttributeKey<String> AWS_QUEUE_NAME = stringKey("aws.queue.name");
   static final AttributeKey<String> AWS_STREAM_NAME = stringKey("aws.stream.name");
   static final AttributeKey<String> AWS_TABLE_NAME = stringKey("aws.table.name");
+
+  private AwsAttributeKeys() {}
 }

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSampler.java

@@ -7,6 +7,7 @@
 
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.logging.FINE;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toSet;
@@ -149,7 +150,7 @@ private void getAndUpdateSampler() {
             executor.schedule(this::fetchTargets, DEFAULT_TARGET_INTERVAL_NANOS, NANOSECONDS);
       }
     } catch (Throwable t) {
-      logger.log(Level.FINE, "Failed to update sampler", t);
+      logger.log(FINE, "Failed to update sampler", t);
     }
     scheduleSamplerUpdate();
   }

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XrayRulesSampler.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.contrib.awsxray;
 
+import static java.util.logging.Level.FINE;
+
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
@@ -84,7 +86,7 @@ public SamplingResult shouldSample(
     // In practice, X-Ray always returns a Default rule that matches all requests so it is a bug in
     // our code or X-Ray to reach here, fallback just in case.
     logger.log(
-        Level.FINE,
+        FINE,
         "No sampling rule matched the request. "
             + "This is a bug in either the OpenTelemetry SDK or X-Ray.");
     return fallbackSampler.shouldSample(

aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/ResourceHolderTest.java

@@ -21,7 +21,7 @@
  * Unit tests for {@link ResourceHolder}. Note that there isn't a great way to test the "default"
  * fallback logic, as when the test suite is run, the customize logic appears to be invoked.
  */
-public class ResourceHolderTest {
+class ResourceHolderTest {
 
   @Test
   @SuppressWarnings("unchecked")

aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/XrayRulesSamplerTest.java

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.contrib.awsxray;
 
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.TraceId;
@@ -175,7 +175,7 @@ private static SamplingResult doSample(Sampler sampler, String name) {
         TraceId.fromLongs(1, 2),
         name,
         SpanKind.CLIENT,
-        Attributes.of(AttributeKey.stringKey("test"), name),
+        Attributes.of(stringKey("test"), name),
         Collections.emptyList());
   }
 }