applied comments

Author: AsakerMohd

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

@@ -20,6 +20,7 @@
 import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
 import io.opentelemetry.sdk.trace.samplers.SamplingResult;
 import io.opentelemetry.semconv.HttpAttributes;
+import io.opentelemetry.semconv.ServerAttributes;
 import io.opentelemetry.semconv.UrlAttributes;
 import java.time.Duration;
 import java.util.Collections;
@@ -59,6 +60,9 @@ final class SamplingRuleApplier {
 
   private static final Map<String, String> XRAY_CLOUD_PLATFORM;
 
+  // _OTHER request method: https://github.com/open-telemetry/semantic-conventions/blob/main/docs/registry/attributes/http.md?plain=1#L96
+  private static final String _OTHER_REQUEST_METHOD = "_OTHER";
+
   static {
     Map<String, String> xrayCloudPlatform = new HashMap<>();
     xrayCloudPlatform.put(AWS_EC2, "AWS::EC2::Instance");
@@ -190,9 +194,14 @@ boolean matches(Attributes attributes, Resource resource) {
       } else if (entry.getKey().equals(HTTP_METHOD)
           || entry.getKey().equals(HttpAttributes.HTTP_REQUEST_METHOD)) {
         httpMethod = (String) entry.getValue();
-      } else if (entry.getKey().equals(NET_HOST_NAME)) {
+        // according to semantic conventions, if the HTTP request method is not known to instrumentation
+        // it must be set to _OTHER and the HTTP_REQUEST_METHOD_ORIGINAL should contain the original method
+        if (httpMethod.equals(_OTHER_REQUEST_METHOD)) {
+          httpMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD_ORIGINAL);
+        }
+      } else if (entry.getKey().equals(NET_HOST_NAME) || (entry.getKey().equals(ServerAttributes.SERVER_ADDRESS))) {
         host = (String) entry.getValue();
-      } else if (entry.getKey().equals(HTTP_HOST)) {
+      } else if (entry.getKey().equals(HTTP_HOST) || (entry.getKey().equals(ServerAttributes.SERVER_ADDRESS))) {
         // TODO (trask) remove support for deprecated http.host attribute
         host = (String) entry.getValue();
       }