Added patch for the X-Ray Remote Sampler (#1089)

### Description of changes:
Since upstream has updated the HTTP semantic conventions, the X-Ray
Remote Sampler has been outdated as it's been looking at the older
attributes that are no longer emitted. I've created a patch to
temporarily fix this until the change is merged upstream.

To create the patch file:
1. Cloned the
[opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib/)
repo
2. Ran `git checkout v1.39.0` to checkout to the same version used by
the latest release (2.11.0)
3. Made the changes in the `SamplingRuleApplier.java`,
`SamplingRuleApplierTest.java` and the `version.gradle.kts` files
4. Generated the patch file by running `git diff >
opentelemetry-java-contrib.patch`. This should be a temporary patch. I'm
creating another CR in upstream to fix this issue. Once it's fixed, we
will need to update the
[io.opentelemetry.contrib:opentelemetry-aws-xray](https://github.com/aws-observability/aws-otel-java-instrumentation/blob/284eed6a7e50237b2a677258bef58e8bf01c71d9/dependencyManagement/build.gradle.kts#L76)
version to the latest one.

### Testing:

**Testing Setup:**
1. Created a local build of the ADOT Distro by running the following:
```
./gradlew clean
./scripts/local_patch.sh //applies the patches including the new contrib patch
./gradlew build //this builds everything under the adot repo including the sample apps. 
```
2. Used the
[SpringBoot](https://github.com/aws-observability/aws-otel-java-instrumentation/tree/284eed6a7e50237b2a677258bef58e8bf01c71d9/sample-apps/springboot)
sample app which includes both the `outgoing-http-call` and the
`/aws-sdk-call` APIs
3. Started the AWS Adot Collector in a docker container to retrieve
Sampling Rules and to export traces to X-Ray
4. Started the Sample App using the following:
```
JAVA_TOOL_OPTIONS=" -javaagent:/Volumes/workplace/otel/aws-otel-java-instrumentation/otelagent/build/libs/aws-opentelemetry-agent-2.11.0-SNAPSHOT.jar" \
OTEL_METRICS_EXPORTER=none \
OTEL_LOGS_EXPORTER=none \
OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true \
OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4316/v1/metrics \
OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf \
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:4316/v1/traces \
OTEL_RESOURCE_ATTRIBUTES="service.name=$YOUR_SVC_NAME" \
java -jar /Volumes/workplace/otel/aws-otel-java-instrumentation/sample-apps/springboot/build/libs/springboot-2.11.0-SNAPSHOT.jar
```

**Manual Testing:**

For the manual testing. I created three sampling rules
1. Default one with zero sampling
6. Second one with path = `/aws-sdk-call` with 100% sampling
7. Third one with path = `/outgoing-http-call` with 100% sampling

Before the change, calling any of the above APIs wasn't being matched
when it should. After the change, the rules were being matched and each
rule showed the correct stats.

**Before the change:**
![Screenshot 2025-06-01 at 11 34
56 PM](https://github.com/user-attachments/assets/6cc69450-8c8f-47e5-b428-65b2a6a0ef0c)

**After the change:**
![Screenshot 2025-06-01 at 11 29
54 PM](https://github.com/user-attachments/assets/dd10ba67-5e6a-475a-81f2-d8b6481fa71b)



By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.

Author: AsakerMohd

.github/patches/opentelemetry-java-contrib.patch

@@ -0,0 +1,237 @@
+diff --git a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java
+index 1ef8abf..ef84f35 100644
+--- a/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java
++++ b/aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java
+@@ -35,6 +35,11 @@ final class SamplingRuleApplier {
+ 
+   private static final Map<String, String> XRAY_CLOUD_PLATFORM;
+ 
++  private static final AttributeKey<String> URL_PATH = AttributeKey.stringKey("url.path");
++  private static final AttributeKey<String> URL_FULL = AttributeKey.stringKey("url.full");
++  private static final AttributeKey<String> HTTP_REQUEST_METHOD =
++      AttributeKey.stringKey("http.request.method");
++
+   static {
+     Map<String, String> xrayCloudPlatform = new HashMap<>();
+     xrayCloudPlatform.put(ResourceAttributes.CloudPlatformValues.AWS_EC2, "AWS::EC2::Instance");
+@@ -162,11 +167,14 @@ final class SamplingRuleApplier {
+     String host = null;
+ 
+     for (Map.Entry<AttributeKey<?>, Object> entry : attributes.asMap().entrySet()) {
+-      if (entry.getKey().equals(SemanticAttributes.HTTP_TARGET)) {
++      if (entry.getKey().equals(SemanticAttributes.HTTP_TARGET)
++          || entry.getKey().equals(URL_PATH)) {
+         httpTarget = (String) entry.getValue();
+-      } else if (entry.getKey().equals(SemanticAttributes.HTTP_URL)) {
++      } else if (entry.getKey().equals(SemanticAttributes.HTTP_URL)
++          || entry.getKey().equals(URL_FULL)) {
+         httpUrl = (String) entry.getValue();
+-      } else if (entry.getKey().equals(SemanticAttributes.HTTP_METHOD)) {
++      } else if (entry.getKey().equals(SemanticAttributes.HTTP_METHOD)
++          || entry.getKey().equals(HTTP_REQUEST_METHOD)) {
+         httpMethod = (String) entry.getValue();
+       } else if (entry.getKey().equals(SemanticAttributes.NET_HOST_NAME)) {
+         host = (String) entry.getValue();
+diff --git a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplierTest.java b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplierTest.java
+index 6bb6e82..55dabbd 100644
+--- a/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplierTest.java
++++ b/aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplierTest.java
+@@ -42,6 +42,11 @@ class SamplingRuleApplierTest {
+ 
+   private static final String CLIENT_ID = "test-client-id";
+ 
++  private static final AttributeKey<String> URL_PATH = AttributeKey.stringKey("url.path");
++  private static final AttributeKey<String> URL_FULL = AttributeKey.stringKey("url.full");
++  private static final AttributeKey<String> HTTP_REQUEST_METHOD =
++      AttributeKey.stringKey("http.request.method");
++
+   @Nested
+   @SuppressWarnings("ClassCanBeStatic")
+   class ExactMatch {
+@@ -68,6 +73,15 @@ class SamplingRuleApplierTest {
+             .put(AttributeKey.longKey("speed"), 10)
+             .build();
+ 
++    private final Attributes newSemCovAttributes =
++        Attributes.builder()
++            .put(HTTP_REQUEST_METHOD, "GET")
++            .put(SemanticAttributes.NET_HOST_NAME, "opentelemetry.io")
++            .put(URL_PATH, "/instrument-me")
++            .put(AttributeKey.stringKey("animal"), "cat")
++            .put(AttributeKey.longKey("speed"), 10)
++            .build();
++
+     // FixedRate set to 1.0 in rule and no reservoir
+     @Test
+     void fixedRateAlwaysSample() {
+@@ -116,6 +130,21 @@ class SamplingRuleApplierTest {
+           .isTrue();
+     }
+ 
++    @Test
++    void matchesURLFullNewSemCov() {
++      assertThat(applier.matches(newSemCovAttributes, resource)).isTrue();
++
++      // http.url works too
++      assertThat(
++              applier.matches(
++                  attributes.toBuilder()
++                      .remove(URL_FULL)
++                      .put(URL_FULL, "scheme://host:port/instrument-me")
++                      .build(),
++                  resource))
++          .isTrue();
++    }
++
+     @Test
+     void serviceNameNotMatch() {
+       assertThat(
+@@ -137,6 +166,13 @@ class SamplingRuleApplierTest {
+       assertThat(applier.matches(attributes, resource)).isFalse();
+     }
+ 
++    @Test
++    void methodNewSemCovNotMatch() {
++      Attributes attributes =
++          this.newSemCovAttributes.toBuilder().put(HTTP_REQUEST_METHOD, "POST").build();
++      assertThat(applier.matches(attributes, resource)).isFalse();
++    }
++
+     @Test
+     void hostNotMatch() {
+       // Replacing dot with character makes sure we're not accidentally treating dot as regex
+@@ -178,6 +214,34 @@ class SamplingRuleApplierTest {
+       assertThat(applier.matches(attributes, resource)).isFalse();
+     }
+ 
++    @Test
++    void pathNewSemCovNotMatch() {
++      Attributes attributes =
++          this.newSemCovAttributes.toBuilder().put(URL_PATH, "/instrument-you").build();
++      assertThat(applier.matches(attributes, resource)).isFalse();
++      attributes =
++          this.newSemCovAttributes.toBuilder()
++              .remove(URL_PATH)
++              .put(URL_FULL, "scheme://host:port/instrument-you")
++              .build();
++      assertThat(applier.matches(attributes, resource)).isFalse();
++      attributes =
++          this.newSemCovAttributes.toBuilder()
++              .remove(URL_PATH)
++              .put(URL_FULL, "scheme://host:port")
++              .build();
++      assertThat(applier.matches(attributes, resource)).isFalse();
++
++      // Correct path, but we ignore anyways since the URL is malformed per spec, scheme is always
++      // present.
++      attributes =
++          this.newSemCovAttributes.toBuilder()
++              .remove(URL_PATH)
++              .put(URL_FULL, "host:port/instrument-me")
++              .build();
++      assertThat(applier.matches(attributes, resource)).isFalse();
++    }
++
+     @Test
+     void attributeNotMatch() {
+       Attributes attributes =
+@@ -243,6 +307,15 @@ class SamplingRuleApplierTest {
+             .put(AttributeKey.longKey("speed"), 10)
+             .build();
+ 
++    private final Attributes newSemCovAttributes =
++        Attributes.builder()
++            .put(HTTP_REQUEST_METHOD, "GET")
++            .put(SemanticAttributes.NET_HOST_NAME, "opentelemetry.io")
++            .put(URL_PATH, "/instrument-me?foo=bar&cat=meow")
++            .put(AttributeKey.stringKey("animal"), "cat")
++            .put(AttributeKey.longKey("speed"), 10)
++            .build();
++
+     // FixedRate set to 0.0 in rule and no reservoir
+     @Test
+     void fixedRateNeverSample() {
+@@ -329,6 +402,26 @@ class SamplingRuleApplierTest {
+       assertThat(applier.matches(attributes, resource)).isFalse();
+     }
+ 
++    @Test
++    void newSemCovMethodMatches() {
++      Attributes attributes =
++          this.newSemCovAttributes.toBuilder().put(HTTP_REQUEST_METHOD, "BADGETGOOD").build();
++      assertThat(applier.matches(attributes, resource)).isTrue();
++      attributes = newSemCovAttributes.toBuilder().put(HTTP_REQUEST_METHOD, "BADGET").build();
++      assertThat(applier.matches(attributes, resource)).isTrue();
++      attributes = newSemCovAttributes.toBuilder().put(HTTP_REQUEST_METHOD, "GETGET").build();
++      assertThat(applier.matches(attributes, resource)).isTrue();
++    }
++
++    @Test
++    void newSemCovMethodNotMatch() {
++      Attributes attributes =
++          newSemCovAttributes.toBuilder().put(HTTP_REQUEST_METHOD, "POST").build();
++      assertThat(applier.matches(attributes, resource)).isFalse();
++      attributes = removeAttribute(newSemCovAttributes, HTTP_REQUEST_METHOD);
++      assertThat(applier.matches(attributes, resource)).isFalse();
++    }
++
+     @Test
+     void hostMatches() {
+       Attributes attributes =
+@@ -410,6 +503,29 @@ class SamplingRuleApplierTest {
+       assertThat(applier.matches(attributes, resource)).isFalse();
+     }
+ 
++    @Test
++    void pathNewSemCovMatches() {
++      Attributes attributes =
++          newSemCovAttributes.toBuilder().put(URL_PATH, "/instrument-me?foo=bar&cat=").build();
++      assertThat(applier.matches(attributes, resource)).isTrue();
++      // Deceptive question mark, it's actually a wildcard :-)
++      attributes =
++          newSemCovAttributes.toBuilder().put(URL_PATH, "/instrument-meafoo=bar&cat=").build();
++      assertThat(applier.matches(attributes, resource)).isTrue();
++    }
++
++    @Test
++    void pathNewSemCovNotMatch() {
++      Attributes attributes =
++          newSemCovAttributes.toBuilder().put(URL_PATH, "/instrument-mea?foo=bar&cat=").build();
++      assertThat(applier.matches(attributes, resource)).isFalse();
++      attributes =
++          newSemCovAttributes.toBuilder().put(URL_PATH, "foo/instrument-meafoo=bar&cat=").build();
++      assertThat(applier.matches(attributes, resource)).isFalse();
++      attributes = removeAttribute(newSemCovAttributes, URL_PATH);
++      assertThat(applier.matches(attributes, resource)).isFalse();
++    }
++
+     @Test
+     void attributeMatches() {
+       Attributes attributes =
+diff --git a/disk-buffering/build.gradle.kts b/disk-buffering/build.gradle.kts
+index 041d2e9..e3d60f4 100644
+--- a/disk-buffering/build.gradle.kts
++++ b/disk-buffering/build.gradle.kts
+@@ -70,6 +70,10 @@ tasks.named<ShadowJar>("shadowJar") {
+   mustRunAfter("jar")
+ }
+ 
++tasks.withType<Test>().configureEach {
++  dependsOn("shadowJar")
++}
++
+ // The javadoc from wire's generated classes has errors that make the task that generates the "javadoc" artifact to fail. This
+ // makes the javadoc task to ignore those generated classes.
+ tasks.withType(Javadoc::class.java) {
+diff --git a/version.gradle.kts b/version.gradle.kts
+index acefcee..329b524 100644
+--- a/version.gradle.kts
++++ b/version.gradle.kts
+@@ -1,5 +1,5 @@
+-val stableVersion = "1.39.0"
+-val alphaVersion = "1.39.0-alpha"
++val stableVersion = "1.39.0-adot1"
++val alphaVersion = "1.39.0-alpha-adot1"
+ 
+ allprojects {
+   if (findProperty("otel.stable") != "true") {

.github/patches/versions

@@ -1 +1,2 @@
 OTEL_JAVA_INSTRUMENTATION_VERSION=v2.11.0
+OTEL_JAVA_CONTRIB_VERSION=v1.39.0

dependencyManagement/build.gradle.kts

@@ -73,7 +73,7 @@ val dependencyLists = listOf(
   "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.4",
   "com.squareup.okhttp3:okhttp:4.12.0",
-  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.39.0",
+  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.39.0-adot1",
   "io.opentelemetry.contrib:opentelemetry-aws-resources:1.39.0-alpha",
   "io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
   "io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion",

lambda-layer/build-layer.sh

@@ -34,6 +34,22 @@ patch -p1 < "$SOURCEDIR"/patches/StreamHandlerInstrumentation.patch
 popd
 rm -rf opentelemetry-java-instrumentation
 
+contrib_version=$(awk -F'=v' '/OTEL_JAVA_CONTRIB_VERSION/ {print $2}' "$file")
+if [[ -n "$contrib_version" ]]; then
+  echo "Found OTEL Contrib Version: ${contrib_version}"
+  ## Clone and Patch the OpenTelemetry Java contrib Repository
+  echo "Info: Cloning and Patching OpenTelemetry Java contrib Repository"
+  git clone https://github.com/open-telemetry/opentelemetry-java-contrib.git
+  pushd opentelemetry-java-contrib
+  git checkout v${contrib_version} -b tag-v${contrib_version}
+
+  # There is another patch in the .github/patches directory for other changes. We should apply them too for consistency.
+  patch -p1 < "$SOURCEDIR"/../.github/patches/opentelemetry-java-contrib.patch
+
+  ./gradlew publishToMavenLocal
+  popd
+  rm -rf opentelemetry-java-contrib
+fi
 
 ## Build the ADOT Java from current source
 echo "Info: Building ADOT Java from current source"