Replace isEmpty with .equals()

Author: harrryr

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/misc/RuntimeMetricsTest.java

@@ -105,7 +105,7 @@ private void testGaugeMetrics(
               .allMatch(
                   dp -> {
                     boolean valid = true;
-                    if (!attributeKey.isEmpty()) {
+                    if (!attributeKey.equals("")) {
                       valid =
                           dp.getAttributesList().stream()
                               .anyMatch(attribute -> attribute.getKey().equals(attributeKey));
@@ -129,7 +129,7 @@ private void testCounterMetrics(
               .allMatch(
                   dp -> {
                     boolean valid = true;
-                    if (!attributeKey.isEmpty()) {
+                    if (!attributeKey.equals("")) {
                       valid =
                           dp.getAttributesList().stream()
                               .anyMatch(attribute -> attribute.getKey().equals(attributeKey));

appsignals-tests/contract-tests/src/test/java/software/amazon/opentelemetry/appsignals/test/utils/MockCollectorClient.java

@@ -160,7 +160,7 @@ private List<ResourceScopeMetric> fetchMetrics(Set<String> presentMetrics, boole
                       .flatMap(x -> x.getMetricsList().stream())
                       .map(x -> x.getName())
                       .collect(Collectors.toSet());
-              if (!exported.isEmpty() && receivedMetrics.containsAll(presentMetrics)) {
+              if (!exported.equals("") && receivedMetrics.containsAll(presentMetrics)) {
                 if (exactMatch) {
                   return current.size() == exported.size();
                 } else {
@@ -183,7 +183,7 @@ private List<ResourceScopeMetric> fetchMetrics(Set<String> presentMetrics, boole
   private <T> List<T> waitForContent(String url, TypeReference<List<T>> t) {
     // Verify that there is no more data to be received
     return this.waitForContent(
-        url, t, (current, exported) -> (!exported.isEmpty() && current.size() == exported.size()));
+        url, t, (current, exported) -> (!exported.equals("") && current.size() == exported.size()));
   }
 
   private <T> List<T> waitForContent(

appsignals-tests/images/http-servers/tomcat/src/main/java/software/amazon/opentelemetry/appsignals/tests/images/httpservers/tomcat/Main.java

@@ -26,7 +26,7 @@ public static void main(String[] args) throws Exception {
     // The port that we should run on can be set into an environment variable
     // Look for that variable and default to 8080 if it isn't there.
     String webPort = System.getenv("PORT");
-    if (webPort == null || webPort.isEmpty()) {
+    if (webPort == null || webPort.equals("")) {
       webPort = "8080";
     }
 

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

@@ -332,7 +332,7 @@ private static String generateRemoteService(SpanData span) {
       String httpUrl = span.getAttributes().get(HTTP_URL);
       try {
         URL url = new URL(httpUrl);
-        if (!url.getHost().isEmpty()) {
+        if (!url.getHost().equals("")) {
           remoteService = url.getHost();
           if (url.getPort() != -1) {
             remoteService += ":" + url.getPort();
@@ -502,7 +502,7 @@ private static void setRemoteResourceTypeAndIdentifier(SpanData span, Attributes
       remoteResourceIdentifier = getDbConnection(span);
     }
 
-    if (cloudformationPrimaryIdentifier.isEmpty()) {
+    if (cloudformationPrimaryIdentifier.equals("")) {
       cloudformationPrimaryIdentifier = remoteResourceIdentifier;
     }
 
@@ -728,7 +728,7 @@ private static String getDBStatementRemoteOperation(
     }
 
     Matcher matcher = SQL_DIALECT_PATTERN.matcher(remoteOperation.toUpperCase());
-    if (matcher.find() && !matcher.group(0).isEmpty()) {
+    if (matcher.find() && !matcher.group(0).equals("")) {
       remoteOperation = matcher.group(0);
     } else {
       remoteOperation = UNKNOWN_REMOTE_OPERATION;

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

@@ -115,7 +115,7 @@ private List<SpanData> addMetricAttributes(Collection<SpanData> spans) {
         attributes = attributeMap.get(MetricAttributeGenerator.DEPENDENCY_METRIC);
       }
 
-      if (!attributes.isEmpty()) {
+      if (!attributes.equals("")) {
         span = wrapSpanWithAttributes(span, attributes);
       }
       modifiedSpans.add(span);

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

@@ -165,7 +165,7 @@ private void recordLatency(ReadableSpan span, Attributes attributes) {
 
   private void recordMetrics(ReadableSpan span, SpanData spanData, Attributes attributes) {
     // Only record metrics if non-empty attributes are returned.
-    if (!attributes.isEmpty()) {
+    if (!attributes.equals("")) {
       recordErrorOrFault(spanData, attributes);
       recordLatency(span, attributes);
     }

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

@@ -109,7 +109,7 @@ static String getEgressOperation(SpanData span) {
    * @return the first part from the http target. Eg, /payment
    */
   static String extractAPIPathValue(String httpTarget) {
-    if (httpTarget == null || httpTarget.isEmpty()) {
+    if (httpTarget == null || httpTarget.equals("")) {
       return "/";
     }
     String[] paths = httpTarget.split("/");

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

@@ -200,7 +200,7 @@ CompletableResultCode doRun() {
       if (exportAvailable.compareAndSet(true, false)) {
         try {
           Collection<MetricData> metricData = collectionRegistration.collectAllMetrics();
-          if (metricData.isEmpty()) {
+          if (metricData.equals("")) {
             logger.log(Level.FINE, "No metric data to export - skipping export.");
             flushResult.succeed();
             exportAvailable.set(true);

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java

@@ -1005,7 +1005,7 @@ private void validateAttributesProducedForNonLocalRootSpanOfKind(
         GENERATOR.generateMetricAttributeMapFromSpan(spanDataMock, resource);
     Attributes serviceAttributes = attributeMap.get(SERVICE_METRIC);
     Attributes dependencyAttributes = attributeMap.get(DEPENDENCY_METRIC);
-    if (!attributeMap.isEmpty()) {
+    if (!attributeMap.equals("")) {
       if (SpanKind.PRODUCER.equals(kind)
           || SpanKind.CLIENT.equals(kind)
           || SpanKind.CONSUMER.equals(kind)) {
@@ -1120,7 +1120,7 @@ private void validateHttpStatusForNonLocalRootWithThrowableForClient(
     Map<String, Attributes> attributeMap =
         GENERATOR.generateMetricAttributeMapFromSpan(spanDataMock, resource);
     Attributes actualAttributes = Attributes.empty();
-    if (!attributeMap.isEmpty()) {
+    if (!attributeMap.equals("")) {
       if (SpanKind.PRODUCER.equals(spanKind)
           || SpanKind.CLIENT.equals(spanKind)
           || SpanKind.CONSUMER.equals(spanKind)) {

buildSrc/src/main/kotlin/software/amazon/adot/GradleUtils.kt

@@ -9,7 +9,7 @@ import com.google.cloud.tools.jib.gradle.JibExtension
 fun JibExtension.configureImages(sourceImage:String, destinationImage: String, localDocker: Boolean, multiPlatform: Boolean, tags: Set<String> = setOf<String>()) {
   to {
     image = destinationImage
-    if (!tags.isEmpty()) {
+    if (!tags.equals("")) {
       this.tags = tags;
     }
   }