Skip to content

Commit cb4d28f

Browse files
committed
Revert "Added patch for the X-Ray Remote Sampler (aws-observability#1089)"
This reverts commit 5255564.
1 parent e6ee25a commit cb4d28f

File tree

4 files changed

+1
-255
lines changed

4 files changed

+1
-255
lines changed

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

Lines changed: 0 additions & 237 deletions
This file was deleted.

.github/patches/versions

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.18.1
2-
OTEL_JAVA_CONTRIB_VERSION=v1.39.0

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ val dependencyLists = listOf(
7373
"commons-logging:commons-logging:1.2",
7474
"com.sparkjava:spark-core:2.9.4",
7575
"com.squareup.okhttp3:okhttp:4.12.0",
76-
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.39.0-adot1",
76+
"io.opentelemetry.contrib:opentelemetry-aws-xray:1.39.0",
7777
"io.opentelemetry.contrib:opentelemetry-aws-resources:1.39.0-alpha",
7878
"io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
7979
"io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion",

lambda-layer/build-layer.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,6 @@ patch -p1 < "$SOURCEDIR"/patches/opentelemetry-java-instrumentation.patch
3232
popd
3333
rm -rf opentelemetry-java-instrumentation
3434

35-
contrib_version=$(awk -F'=v' '/OTEL_JAVA_CONTRIB_VERSION/ {print $2}' "$file")
36-
if [[ -n "$contrib_version" ]]; then
37-
echo "Found OTEL Contrib Version: ${contrib_version}"
38-
## Clone and Patch the OpenTelemetry Java contrib Repository
39-
echo "Info: Cloning and Patching OpenTelemetry Java contrib Repository"
40-
git clone https://github.com/open-telemetry/opentelemetry-java-contrib.git
41-
pushd opentelemetry-java-contrib
42-
git checkout v${contrib_version} -b tag-v${contrib_version}
43-
44-
# There is another patch in the .github/patches directory for other changes. We should apply them too for consistency.
45-
patch -p1 < "$SOURCEDIR"/../.github/patches/opentelemetry-java-contrib.patch
46-
47-
./gradlew publishToMavenLocal
48-
popd
49-
rm -rf opentelemetry-java-contrib
50-
fi
5135

5236
## Build the ADOT Java from current source
5337
echo "Info: Building ADOT Java from current source"

0 commit comments

Comments
 (0)