Skip to content

Commit 918fc6e

Browse files
Bump opentelemetry-javaagent from 1.21.0 to 1.22.1 (#693)
1 parent b891980 commit 918fc6e

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ val CORE_DEPENDENCIES = listOf(
4949
)
5050

5151
val DEPENDENCIES = listOf(
52-
"io.opentelemetry.javaagent:opentelemetry-javaagent:1.21.0",
52+
"io.opentelemetry.javaagent:opentelemetry-javaagent:1.22.1",
5353
"com.google.code.findbugs:annotations:3.0.1u2",
5454
"com.google.code.findbugs:jsr305:3.0.2",
5555
"com.squareup.okhttp3:okhttp:4.10.0",

static-instrumenter/agent-instrumenter/src/integrationTest/java/JarTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ void testSampleJar() throws Exception {
6868
resultAppPath + File.pathSeparator + noInstAgentPath,
6969
APP_MAIN);
7070

71+
// TODO autoconfigure GlobalOpenTelemetry explicitly in static instrumentation
72+
runtimeProcessBuilder.environment().put("OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED", "true");
73+
7174
Process runtimeProcess = runtimeProcessBuilder.start();
7275
runtimeProcess.waitFor(10, TimeUnit.SECONDS);
7376

static-instrumenter/maven-plugin/src/test/java/io/opentelemetry/contrib/staticinstrumenter/plugin/maven/OpenTelemetryInstrumenterMojoTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ void shouldInstrumentSampleApplication() throws Exception {
3737
private static void verifyApplicationByExampleRun(Path instrumentedApp) throws Exception {
3838
ProcessBuilder pb =
3939
new ProcessBuilder("java", "-jar", instrumentedApp.toString()).redirectErrorStream(true);
40+
41+
// TODO autoconfigure GlobalOpenTelemetry explicitly in static instrumentation
42+
pb.environment().put("OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED", "true");
43+
4044
Process process = pb.start();
4145
process.waitFor();
4246
String output = new String(process.getInputStream().readAllBytes(), Charset.defaultCharset());

0 commit comments

Comments
 (0)