Prepare for release. Update Java Patches and JS deps (#816)

* Update JS deps * Update java Patches
aws-observability · Dec 21, 2023 · b004753 · b004753
1 parent 4feed02
commit b004753
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/java/build.gradle.kts b/java/build.gradle.kts
@@ -28,12 +28,12 @@ val javaagentDependency by configurations.creating {
 }
 
 dependencies {
-    compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.31.0"))
-    compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.31.0-alpha"))
+    compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.32.0"))
+    compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha"))
     // Already included in wrapper so compileOnly
     compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
     compileOnly("io.opentelemetry:opentelemetry-sdk-extension-aws")
-    javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:1.31.0-adot-lambda1")
+    javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:1.32.0-adot-lambda1")
 }
 
 tasks.register<Copy>("download") {

diff --git a/java/build.sh b/java/build.sh
@@ -4,8 +4,8 @@ SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 
 ## revert https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7970
-OTEL_VERSION="1.31.0"
-ADOT_VERSION="1.31.0"
+OTEL_VERSION="1.32.0"
+ADOT_VERSION="1.32.0"
 
 git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
 pushd opentelemetry-java-instrumentation

diff --git a/nodejs/wrapper-adot/package.json b/nodejs/wrapper-adot/package.json
@@ -25,7 +25,7 @@
     "node": ">=14.0.0"
   },
   "devDependencies": {
-    "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/api": "^1.7.0",
     "@types/node": "20.10.4",
     "@typescript-eslint/eslint-plugin": "6.14.0",
     "@typescript-eslint/parser": "6.13.2",
@@ -37,11 +37,11 @@
     "typescript": "5.2.2"
   },
   "dependencies": {
-    "@opentelemetry/core": "^1.17.1",
+    "@opentelemetry/core": "^1.18.1",
     "@opentelemetry/id-generator-aws-xray": "^1.2.1",
-    "@opentelemetry/sdk-trace-node": "^1.17.1",
+    "@opentelemetry/sdk-trace-node": "^1.18.1",
     "@opentelemetry/propagator-aws-xray": "^1.3.1",
-    "@opentelemetry/propagator-b3": "^1.17.1",
-    "@opentelemetry/sdk-trace-base": "^1.17.1"
+    "@opentelemetry/propagator-b3": "^1.18.1",
+    "@opentelemetry/sdk-trace-base": "^1.18.1"
   }
 }
diff --git a/patches/aws-otel-java-instrumentation.patch b/patches/aws-otel-java-instrumentation.patch
@@ -6,8 +6,8 @@ index 9493189..6090207 100644
  val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
  // This is the version of the upstream instrumentation BOM
--val otelVersion = "1.31.0"
-+val otelVersion = "1.31.0-adot-lambda1"
- val otelSnapshotVersion = "1.32.0"
+-val otelVersion = "1.32.0-adot1"
++val otelVersion = "1.32.0-adot-lambda1"
+ val otelSnapshotVersion = "1.33.0"
  val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
  val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
diff --git a/patches/opentelemetry-java-instrumentation.patch b/patches/opentelemetry-java-instrumentation.patch
@@ -604,10 +604,10 @@ index cc1414c0bf..db8a59b046 100644
 --- a/version.gradle.kts
 +++ b/version.gradle.kts
 @@ -1,5 +1,5 @@
--val stableVersion = "1.31.0"
--val alphaVersion = "1.31.0-alpha"
-+val stableVersion = "1.31.0-adot-lambda1"
-+val alphaVersion = "1.31.0-adot-lambda1-alpha"
+-val stableVersion = "1.32.0"
+-val alphaVersion = "1.32.0-alpha"
++val stableVersion = "1.32.0-adot-lambda1"
++val alphaVersion = "1.32.0-adot-lambda1-alpha"
 
  allprojects {
    if (findProperty("otel.stable") != "true") {
diff --git a/patches/opentelemetry-lambda_java.patch b/patches/opentelemetry-lambda_java.patch
@@ -19,17 +19,17 @@ index abb6c06..b20f093 100644
  data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
  val DEPENDENCY_BOMS = listOf(
--    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.31.0-alpha",
-+    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.31.0-adot-lambda1-alpha",
-     "org.apache.logging.log4j:log4j-bom:2.21.1",
-     "software.amazon.awssdk:bom:2.21.0"
+-    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-alpha",
++    "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-adot-lambda1-alpha",
+     "org.apache.logging.log4j:log4j-bom:2.22.0",
+     "software.amazon.awssdk:bom:2.21.42"
  )
 @@ -18,7 +18,7 @@ val DEPENDENCIES = listOf(
      "com.amazonaws:aws-lambda-java-core:1.2.3",
-     "com.amazonaws:aws-lambda-java-events:3.11.3",
-     "com.squareup.okhttp3:okhttp:4.11.0",
--    "io.opentelemetry.javaagent:opentelemetry-javaagent:1.31.0"
-+    "io.opentelemetry.javaagent:opentelemetry-javaagent:1.31.0-adot-lambda1"
+     "com.amazonaws:aws-lambda-java-events:3.11.4",
+     "com.squareup.okhttp3:okhttp:4.12.0",
+-    "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0"
++    "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0-adot-lambda1"
  )
 
  javaPlatform {