Skip to content

Commit 35b28a4

Browse files
authored
fix opentelemetry-lambda_java.patch after updating submodule (#951)
1 parent 33e00a9 commit 35b28a4

File tree

1 file changed

+9
-87
lines changed

1 file changed

+9
-87
lines changed

patches/opentelemetry-lambda_java.patch

Lines changed: 9 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -62,33 +62,34 @@ index 7693c66..d3941ac 100644
6262
}
6363

6464
diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts
65-
index ec7dc65..cceb485 100644
65+
index 6bf6c31..f96171e 100644
6666
--- a/java/dependencyManagement/build.gradle.kts
6767
+++ b/java/dependencyManagement/build.gradle.kts
6868
@@ -9,18 +9,16 @@ plugins {
6969
data class DependencySet(val group: String, val version: String, val modules: List<String>)
70-
70+
7171
val DEPENDENCY_BOMS = listOf(
72-
- "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.3.0-alpha",
72+
- "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.4.0-alpha",
7373
- "org.apache.logging.log4j:log4j-bom:2.23.1",
74-
- "software.amazon.awssdk:bom:2.25.43"
74+
- "software.amazon.awssdk:bom:2.25.64"
7575
+ "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.32.0-adot-lambda1-alpha",
7676
+ "org.apache.logging.log4j:log4j-bom:2.22.1",
7777
+ "software.amazon.awssdk:bom:2.24.2"
7878
)
79-
79+
8080
val DEPENDENCIES = listOf(
8181
"com.amazonaws:aws-lambda-java-core:1.2.3",
8282
- "com.amazonaws:aws-lambda-java-events:3.11.5",
8383
+ "com.amazonaws:aws-lambda-java-events:3.11.4",
8484
"com.squareup.okhttp3:okhttp:4.12.0",
85-
- "io.opentelemetry.javaagent:opentelemetry-javaagent:2.3.0",
85+
- "io.opentelemetry.javaagent:opentelemetry-javaagent:2.4.0",
8686
- "io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0",
87-
- "io.opentelemetry.contrib:opentelemetry-aws-resources:1.35.0-alpha",
87+
- "io.opentelemetry.contrib:opentelemetry-aws-resources:1.36.0-alpha",
8888
+ "io.opentelemetry.javaagent:opentelemetry-javaagent:1.32.0-adot-lambda1"
8989
)
90-
90+
9191
javaPlatform {
92+
9293
diff --git a/java/gradle/wrapper/gradle-wrapper.jar b/java/gradle/wrapper/gradle-wrapper.jar
9394
index e644113..7454180 100644
9495
Binary files a/java/gradle/wrapper/gradle-wrapper.jar and b/java/gradle/wrapper/gradle-wrapper.jar differ
@@ -459,85 +460,6 @@ index 1aa94a4..4f906e0 100755
459460
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
460461

461462
exec "$JAVACMD" "$@"
462-
diff --git a/java/gradlew.bat b/java/gradlew.bat
463-
index 7101f8e..ac1b06f 100644
464-
--- a/java/gradlew.bat
465-
+++ b/java/gradlew.bat
466-
@@ -14,7 +14,7 @@
467-
@rem limitations under the License.
468-
@rem
469-
470-
-@if "%DEBUG%"=="" @echo off
471-
+@if "%DEBUG%" == "" @echo off
472-
@rem ##########################################################################
473-
@rem
474-
@rem Gradle startup script for Windows
475-
@@ -25,8 +25,7 @@
476-
if "%OS%"=="Windows_NT" setlocal
477-
478-
set DIRNAME=%~dp0
479-
-if "%DIRNAME%"=="" set DIRNAME=.
480-
-@rem This is normally unused
481-
+if "%DIRNAME%" == "" set DIRNAME=.
482-
set APP_BASE_NAME=%~n0
483-
set APP_HOME=%DIRNAME%
484-
485-
@@ -41,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
486-
487-
set JAVA_EXE=java.exe
488-
%JAVA_EXE% -version >NUL 2>&1
489-
-if %ERRORLEVEL% equ 0 goto execute
490-
+if "%ERRORLEVEL%" == "0" goto execute
491-
492-
-echo. 1>&2
493-
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
494-
-echo. 1>&2
495-
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
496-
-echo location of your Java installation. 1>&2
497-
+echo.
498-
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
499-
+echo.
500-
+echo Please set the JAVA_HOME variable in your environment to match the
501-
+echo location of your Java installation.
502-
503-
goto fail
504-
505-
@@ -57,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
506-
507-
if exist "%JAVA_EXE%" goto execute
508-
509-
-echo. 1>&2
510-
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
511-
-echo. 1>&2
512-
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
513-
-echo location of your Java installation. 1>&2
514-
+echo.
515-
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
516-
+echo.
517-
+echo Please set the JAVA_HOME variable in your environment to match the
518-
+echo location of your Java installation.
519-
520-
goto fail
521-
522-
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
523-
524-
:end
525-
@rem End local scope for the variables with windows NT shell
526-
-if %ERRORLEVEL% equ 0 goto mainEnd
527-
+if "%ERRORLEVEL%"=="0" goto mainEnd
528-
529-
:fail
530-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
531-
rem the _cmd.exe /c_ return code!
532-
-set EXIT_CODE=%ERRORLEVEL%
533-
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
534-
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
535-
-exit /b %EXIT_CODE%
536-
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
537-
+exit /b 1
538-
539-
:mainEnd
540-
if "%OS%"=="Windows_NT" endlocal
541463
diff --git a/java/layer-javaagent/scripts/otel-handler b/java/layer-javaagent/scripts/otel-handler
542464
index adb31a2..6e4cd91 100755
543465
--- a/java/layer-javaagent/scripts/otel-handler

0 commit comments

Comments
 (0)