Skip to content

Commit 9397c41

Browse files
pavolloffaypavolloffay
authored
Use Java8Bytecode bridge to avoid validation error (#122)
Signed-off-by: Pavol Loffay <[email protected]>
1 parent e625365 commit 9397c41

File tree

6 files changed

+14
-22
lines changed

6 files changed

+14
-22
lines changed

‎instrumentation/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ subprojects {
1212

1313
implementation("io.opentelemetry:opentelemetry-api:0.10.0")
1414
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:0.10.1")
15+
implementation("io.opentelemetry.javaagent:opentelemetry-javaagent-api:0.10.1")
1516
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:0.10.1")
1617
implementation(project(":javaagent-core"))
1718
implementation(project(":filter-api"))

‎instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet2BodyInstrumentation.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.google.auto.service.AutoService;
2929
import io.opentelemetry.api.trace.Span;
3030
import io.opentelemetry.instrumentation.hypertrace.servlet.common.ServletSpanDecorator;
31-
import io.opentelemetry.javaagent.instrumentation.servlet.v2_2.Servlet2HttpServerTracer;
31+
import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
3232
import io.opentelemetry.javaagent.tooling.Instrumenter;
3333
import java.util.Enumeration;
3434
import java.util.HashMap;
@@ -87,10 +87,7 @@ public Map<String, String> contextStore() {
8787
@Override
8888
public String[] helperClassNames() {
8989
return new String[] {
90-
"io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer",
91-
"io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter",
92-
"io.opentelemetry.javaagent.instrumentation.servlet.v2_2.Servlet2HttpServerTracer",
93-
"io.opentelemetry.javaagent.instrumentation.servlet.v2_2.ResponseWithStatus",
90+
"io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge",
9491
"io.opentelemetry.instrumentation.hypertrace.servlet.common.ByteBufferData",
9592
"io.opentelemetry.instrumentation.hypertrace.servlet.common.CharBufferData",
9693
"io.opentelemetry.instrumentation.hypertrace.servlet.common.BufferedWriterWrapper",
@@ -142,7 +139,7 @@ public static Object start(
142139

143140
HttpServletRequest httpRequest = (HttpServletRequest) request;
144141
HttpServletResponse httpResponse = (HttpServletResponse) response;
145-
Span currentSpan = Servlet2HttpServerTracer.getCurrentServerSpan();
142+
Span currentSpan = Java8BytecodeBridge.currentSpan();
146143

147144
rootStart = true;
148145
response = new BufferingHttpServletResponse(httpResponse);
@@ -185,7 +182,7 @@ public static void stopSpan(
185182
}
186183

187184
request.removeAttribute(ALREADY_LOADED);
188-
Span currentSpan = Servlet2HttpServerTracer.getCurrentServerSpan();
185+
Span currentSpan = Java8BytecodeBridge.currentSpan();
189186

190187
BufferingHttpServletResponse bufferingResponse = (BufferingHttpServletResponse) response;
191188
BufferingHttpServletRequest bufferingRequest = (BufferingHttpServletRequest) request;

‎instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0/Servlet30BodyInstrumentation.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.google.auto.service.AutoService;
2929
import io.opentelemetry.api.trace.Span;
3030
import io.opentelemetry.instrumentation.hypertrace.servlet.common.ServletSpanDecorator;
31-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer;
31+
import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
3232
import io.opentelemetry.javaagent.tooling.Instrumenter;
3333
import java.util.Enumeration;
3434
import java.util.HashMap;
@@ -80,9 +80,7 @@ public ElementMatcher<? super TypeDescription> typeMatcher() {
8080
@Override
8181
public String[] helperClassNames() {
8282
return new String[] {
83-
"io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer",
84-
"io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter",
85-
"io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer",
83+
"io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge",
8684
"io.opentelemetry.instrumentation.hypertrace.servlet.common.ByteBufferData",
8785
"io.opentelemetry.instrumentation.hypertrace.servlet.common.CharBufferData",
8886
"io.opentelemetry.instrumentation.hypertrace.servlet.common.BufferedWriterWrapper",
@@ -136,7 +134,7 @@ public static Object start(
136134

137135
HttpServletRequest httpRequest = (HttpServletRequest) request;
138136
HttpServletResponse httpResponse = (HttpServletResponse) response;
139-
Span currentSpan = Servlet3HttpServerTracer.getCurrentServerSpan();
137+
Span currentSpan = Java8BytecodeBridge.currentSpan();
140138

141139
rootStart = true;
142140
response = new BufferingHttpServletResponse(httpResponse);
@@ -177,7 +175,7 @@ public static void stopSpan(
177175
}
178176

179177
request.removeAttribute(ALREADY_LOADED);
180-
Span currentSpan = Servlet3HttpServerTracer.getCurrentServerSpan();
178+
Span currentSpan = Java8BytecodeBridge.currentSpan();
181179

182180
AtomicBoolean responseHandled = new AtomicBoolean(false);
183181
if (request.isAsyncStarted()) {

‎instrumentation/servlet/servlet-3.1/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_1/Servlet31Advice.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import io.opentelemetry.api.trace.Span;
2020
import io.opentelemetry.instrumentation.hypertrace.servlet.common.ServletSpanDecorator;
21-
import io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer;
21+
import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
2222
import java.util.Enumeration;
2323
import java.util.HashMap;
2424
import java.util.Map;
@@ -63,7 +63,7 @@ public static Object start(
6363

6464
HttpServletRequest httpRequest = (HttpServletRequest) request;
6565
HttpServletResponse httpResponse = (HttpServletResponse) response;
66-
Span currentSpan = Servlet3HttpServerTracer.getCurrentServerSpan();
66+
Span currentSpan = Java8BytecodeBridge.currentSpan();
6767

6868
rootStart = true;
6969
response = new BufferingHttpServletResponse(httpResponse);
@@ -105,7 +105,7 @@ public static void stopSpan(
105105
}
106106

107107
request.removeAttribute(ALREADY_LOADED);
108-
Span currentSpan = Servlet3HttpServerTracer.getCurrentServerSpan();
108+
Span currentSpan = Java8BytecodeBridge.currentSpan();
109109

110110
AtomicBoolean responseHandled = new AtomicBoolean(false);
111111
if (request.isAsyncStarted()) {

‎instrumentation/servlet/servlet-3.1/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_1/Servlet31BodyInstrumentation.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ public ElementMatcher<? super TypeDescription> typeMatcher() {
6666
@Override
6767
public String[] helperClassNames() {
6868
return new String[] {
69-
"io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer",
70-
"io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter",
71-
"io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer",
69+
"io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge",
7270
"io.opentelemetry.instrumentation.hypertrace.servlet.common.ByteBufferData",
7371
"io.opentelemetry.instrumentation.hypertrace.servlet.common.CharBufferData",
7472
"io.opentelemetry.instrumentation.hypertrace.servlet.common.BufferedWriterWrapper",

‎instrumentation/spark-web-framework-2.3/src/main/java/io/opentelemetry/instrumentation/hypertrace/sparkjava/SparkJavaBodyInstrumentation.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ public Map<? extends ElementMatcher<? super MethodDescription>, String> transfor
6565
@Override
6666
public String[] helperClassNames() {
6767
return new String[] {
68-
"io.opentelemetry.instrumentation.servlet.ServletHttpServerTracer",
69-
"io.opentelemetry.instrumentation.servlet.HttpServletRequestGetter",
70-
"io.opentelemetry.javaagent.instrumentation.servlet.v3_0.Servlet3HttpServerTracer",
68+
"io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge",
7169
"io.opentelemetry.instrumentation.hypertrace.servlet.common.ByteBufferData",
7270
"io.opentelemetry.instrumentation.hypertrace.servlet.common.CharBufferData",
7371
"io.opentelemetry.instrumentation.hypertrace.servlet.common.BufferedWriterWrapper",

0 commit comments

Comments
 (0)