Skip to content

Commit 3634c21

Browse files
pavolloffaypavolloffay
authored
Add http prefix for HTTP attributes (#60)
Signed-off-by: Pavol Loffay <[email protected]>
1 parent 04ecd42 commit 3634c21

File tree

9 files changed

+60
-41
lines changed

9 files changed

+60
-41
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public static Object start(
160160
String headerName = headerNames.nextElement();
161161
String headerValue = httpRequest.getHeader(headerName);
162162
currentSpan.setAttribute(
163-
HypertraceSemanticAttributes.requestHeader(headerName), headerValue);
163+
HypertraceSemanticAttributes.httpRequestHeader(headerName), headerValue);
164164
headers.put(headerName, headerValue);
165165
}
166166
BlockingResult blockingResult = BlockingProvider.getBlockingEvaluator().evaluate(headers);
@@ -198,14 +198,15 @@ public static void stopSpan(
198198
String headerName = nameToHeadersEntry.getKey();
199199
for (String headerValue : nameToHeadersEntry.getValue()) {
200200
currentSpan.setAttribute(
201-
HypertraceSemanticAttributes.responseHeader(headerName), headerValue);
201+
HypertraceSemanticAttributes.httpResponseHeader(headerName), headerValue);
202202
}
203203
}
204204
// Bodies are captured at the end after all user processing.
205205
currentSpan.setAttribute(
206-
HypertraceSemanticAttributes.REQUEST_BODY, bufferingRequest.getBufferedBodyAsString());
206+
HypertraceSemanticAttributes.HTTP_REQUEST_BODY,
207+
bufferingRequest.getBufferedBodyAsString());
207208
currentSpan.setAttribute(
208-
HypertraceSemanticAttributes.RESPONSE_BODY, bufferingResponse.getBufferAsString());
209+
HypertraceSemanticAttributes.HTTP_RESPONSE_BODY, bufferingResponse.getBufferAsString());
209210
}
210211
}
211212
}

‎instrumentation/servlet/servlet-2.3/src/test/java/io/opentelemetry/instrumentation/hypertrace/servlet/v2_3/Servlet23Test.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,21 @@ public void simpleServlet() throws Exception {
6363
Assertions.assertEquals(1, spans.size());
6464
SpanData spanData = spans.get(0);
6565
Assertions.assertEquals(
66-
requestBody, spanData.getAttributes().get(HypertraceSemanticAttributes.REQUEST_BODY));
66+
requestBody, spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_REQUEST_BODY));
6767
Assertions.assertEquals(
6868
requestHeaderValue,
69-
spanData.getAttributes().get(HypertraceSemanticAttributes.requestHeader(requestHeader)));
69+
spanData
70+
.getAttributes()
71+
.get(HypertraceSemanticAttributes.httpRequestHeader(requestHeader)));
7072

7173
Assertions.assertEquals(
7274
TestServlet.RESPONSE_BODY,
73-
spanData.getAttributes().get(HypertraceSemanticAttributes.RESPONSE_BODY));
75+
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY));
7476
Assertions.assertEquals(
7577
TestServlet.RESPONSE_HEADER_VALUE,
7678
spanData
7779
.getAttributes()
78-
.get(HypertraceSemanticAttributes.responseHeader(TestServlet.RESPONSE_HEADER)));
80+
.get(HypertraceSemanticAttributes.httpResponseHeader(TestServlet.RESPONSE_HEADER)));
7981
server.stop();
8082
}
8183
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public static Object start(
159159
String headerName = headerNames.nextElement();
160160
String headerValue = httpRequest.getHeader(headerName);
161161
currentSpan.setAttribute(
162-
HypertraceSemanticAttributes.requestHeader(headerName), headerValue);
162+
HypertraceSemanticAttributes.httpRequestHeader(headerName), headerValue);
163163
headers.put(headerName, headerValue);
164164
}
165165
BlockingResult blockingResult = BlockingProvider.getBlockingEvaluator().evaluate(headers);
@@ -208,14 +208,15 @@ public static void stopSpan(
208208
for (String headerName : bufferingResponse.getHeaderNames()) {
209209
String headerValue = bufferingResponse.getHeader(headerName);
210210
currentSpan.setAttribute(
211-
HypertraceSemanticAttributes.responseHeader(headerName), headerValue);
211+
HypertraceSemanticAttributes.httpResponseHeader(headerName), headerValue);
212212
}
213213
// Bodies are captured at the end after all user processing.
214214
currentSpan.setAttribute(
215-
HypertraceSemanticAttributes.REQUEST_BODY,
215+
HypertraceSemanticAttributes.HTTP_REQUEST_BODY,
216216
bufferingRequest.getBufferedBodyAsString());
217217
currentSpan.setAttribute(
218-
HypertraceSemanticAttributes.RESPONSE_BODY, bufferingResponse.getBufferAsString());
218+
HypertraceSemanticAttributes.HTTP_RESPONSE_BODY,
219+
bufferingResponse.getBufferAsString());
219220
}
220221
}
221222
}

‎instrumentation/servlet/servlet-3.0/src/test/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0/Servlet30Test.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,21 @@ public void simpleServlet() throws Exception {
6464
Assertions.assertEquals(1, spans.size());
6565
SpanData spanData = spans.get(0);
6666
Assertions.assertEquals(
67-
requestBody, spanData.getAttributes().get(HypertraceSemanticAttributes.REQUEST_BODY));
67+
requestBody, spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_REQUEST_BODY));
6868
Assertions.assertEquals(
6969
requestHeaderValue,
70-
spanData.getAttributes().get(HypertraceSemanticAttributes.requestHeader(requestHeader)));
70+
spanData
71+
.getAttributes()
72+
.get(HypertraceSemanticAttributes.httpRequestHeader(requestHeader)));
7173

7274
Assertions.assertEquals(
7375
TestServlet.RESPONSE_BODY,
74-
spanData.getAttributes().get(HypertraceSemanticAttributes.RESPONSE_BODY));
76+
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY));
7577
Assertions.assertEquals(
7678
TestServlet.RESPONSE_HEADER_VALUE,
7779
spanData
7880
.getAttributes()
79-
.get(HypertraceSemanticAttributes.responseHeader(TestServlet.RESPONSE_HEADER)));
81+
.get(HypertraceSemanticAttributes.httpResponseHeader(TestServlet.RESPONSE_HEADER)));
8082
server.stop();
8183
}
8284
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public static Object start(
156156
String headerName = headerNames.nextElement();
157157
String headerValue = httpRequest.getHeader(headerName);
158158
currentSpan.setAttribute(
159-
HypertraceSemanticAttributes.requestHeader(headerName), headerValue);
159+
HypertraceSemanticAttributes.httpRequestHeader(headerName), headerValue);
160160
headers.put(headerName, headerValue);
161161
}
162162
BlockingResult blockingResult = BlockingProvider.getBlockingEvaluator().evaluate(headers);
@@ -205,14 +205,15 @@ public static void stopSpan(
205205
for (String headerName : bufferingResponse.getHeaderNames()) {
206206
String headerValue = bufferingResponse.getHeader(headerName);
207207
currentSpan.setAttribute(
208-
HypertraceSemanticAttributes.responseHeader(headerName), headerValue);
208+
HypertraceSemanticAttributes.httpResponseHeader(headerName), headerValue);
209209
}
210210
// Bodies are captured at the end after all user processing.
211211
currentSpan.setAttribute(
212-
HypertraceSemanticAttributes.REQUEST_BODY,
212+
HypertraceSemanticAttributes.HTTP_REQUEST_BODY,
213213
bufferingRequest.getBufferedBodyAsString());
214214
currentSpan.setAttribute(
215-
HypertraceSemanticAttributes.RESPONSE_BODY, bufferingResponse.getBufferAsString());
215+
HypertraceSemanticAttributes.HTTP_RESPONSE_BODY,
216+
bufferingResponse.getBufferAsString());
216217
}
217218
}
218219
}

‎instrumentation/servlet/servlet-3.1/src/test/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_1/Servlet31Test.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,21 @@ public void simpleServlet() throws Exception {
6565
Assertions.assertEquals(1, spans.size());
6666
SpanData spanData = spans.get(0);
6767
Assertions.assertEquals(
68-
requestBody, spanData.getAttributes().get(HypertraceSemanticAttributes.REQUEST_BODY));
68+
requestBody, spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_REQUEST_BODY));
6969
Assertions.assertEquals(
7070
requestHeaderValue,
71-
spanData.getAttributes().get(HypertraceSemanticAttributes.requestHeader(requestHeader)));
71+
spanData
72+
.getAttributes()
73+
.get(HypertraceSemanticAttributes.httpRequestHeader(requestHeader)));
7274

7375
Assertions.assertEquals(
7476
TestServlet.RESPONSE_BODY,
75-
spanData.getAttributes().get(HypertraceSemanticAttributes.RESPONSE_BODY));
77+
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY));
7678
Assertions.assertEquals(
7779
TestServlet.RESPONSE_HEADER_VALUE,
7880
spanData
7981
.getAttributes()
80-
.get(HypertraceSemanticAttributes.responseHeader(TestServlet.RESPONSE_HEADER)));
82+
.get(HypertraceSemanticAttributes.httpResponseHeader(TestServlet.RESPONSE_HEADER)));
8183
server.stop();
8284
}
8385
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public static Object onEnter(
125125
String headerName = headerNames.nextElement();
126126
String headerValue = httpRequest.getHeader(headerName);
127127
currentSpan.setAttribute(
128-
HypertraceSemanticAttributes.requestHeader(headerName), headerValue);
128+
HypertraceSemanticAttributes.httpRequestHeader(headerName), headerValue);
129129
headers.put(headerName, headerValue);
130130
}
131131
BlockingResult blockingResult = BlockingProvider.getBlockingEvaluator().evaluate(headers);
@@ -156,13 +156,14 @@ public static Object onExit(
156156
for (String headerName : bufferingResponse.getHeaderNames()) {
157157
String headerValue = bufferingResponse.getHeader(headerName);
158158
currentSpan.setAttribute(
159-
HypertraceSemanticAttributes.responseHeader(headerName), headerValue);
159+
HypertraceSemanticAttributes.httpResponseHeader(headerName), headerValue);
160160
}
161161
// Bodies are captured at the end after all user processing.
162162
currentSpan.setAttribute(
163-
HypertraceSemanticAttributes.REQUEST_BODY, bufferingRequest.getBufferedBodyAsString());
163+
HypertraceSemanticAttributes.HTTP_REQUEST_BODY,
164+
bufferingRequest.getBufferedBodyAsString());
164165
currentSpan.setAttribute(
165-
HypertraceSemanticAttributes.RESPONSE_BODY, bufferingResponse.getBufferAsString());
166+
HypertraceSemanticAttributes.HTTP_RESPONSE_BODY, bufferingResponse.getBufferAsString());
166167
return null;
167168
}
168169
}

‎instrumentation/spark-web-framework-2.3/src/test/java/io/opentelemetry/instrumentation/hypertrace/sparkjava/SparkJavaBodyCaptureTest.java‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,21 @@ public void postRequest() throws IOException, InterruptedException, TimeoutExcep
8989
Assertions.assertEquals(1, spans.size());
9090
SpanData spanData = spans.get(0);
9191
Assertions.assertEquals(
92-
REQUEST_BODY, spanData.getAttributes().get(HypertraceSemanticAttributes.REQUEST_BODY));
92+
REQUEST_BODY, spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_REQUEST_BODY));
9393
Assertions.assertEquals(
9494
REQUEST_HEADER_VALUE,
95-
spanData.getAttributes().get(HypertraceSemanticAttributes.requestHeader(REQUEST_HEADER)));
95+
spanData
96+
.getAttributes()
97+
.get(HypertraceSemanticAttributes.httpRequestHeader(REQUEST_HEADER)));
9698

9799
Assertions.assertEquals(
98-
RESPONSE_BODY, spanData.getAttributes().get(HypertraceSemanticAttributes.RESPONSE_BODY));
100+
RESPONSE_BODY,
101+
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY));
99102
Assertions.assertEquals(
100103
RESPONSE_HEADER_VALUE,
101-
spanData.getAttributes().get(HypertraceSemanticAttributes.responseHeader(RESPONSE_HEADER)));
104+
spanData
105+
.getAttributes()
106+
.get(HypertraceSemanticAttributes.httpResponseHeader(RESPONSE_HEADER)));
102107
}
103108

104109
@Test
@@ -119,13 +124,17 @@ public void exceptionInHandler() throws IOException, InterruptedException, Timeo
119124
SpanData spanData = spans.get(0);
120125
Assertions.assertEquals(
121126
REQUEST_HEADER_VALUE,
122-
spanData.getAttributes().get(HypertraceSemanticAttributes.requestHeader(REQUEST_HEADER)));
127+
spanData
128+
.getAttributes()
129+
.get(HypertraceSemanticAttributes.httpRequestHeader(REQUEST_HEADER)));
123130

124131
Assertions.assertEquals(
125132
"<html><body><h2>500 Internal Error</h2></body></html>",
126-
spanData.getAttributes().get(HypertraceSemanticAttributes.RESPONSE_BODY));
133+
spanData.getAttributes().get(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY));
127134
Assertions.assertEquals(
128135
RESPONSE_HEADER_VALUE,
129-
spanData.getAttributes().get(HypertraceSemanticAttributes.responseHeader(RESPONSE_HEADER)));
136+
spanData
137+
.getAttributes()
138+
.get(HypertraceSemanticAttributes.httpResponseHeader(RESPONSE_HEADER)));
130139
}
131140
}

‎javaagent-core/src/main/java/org/hypertrace/agent/core/HypertraceSemanticAttributes.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
public class HypertraceSemanticAttributes {
2525
private HypertraceSemanticAttributes() {}
2626

27-
public static AttributeKey<String> requestHeader(String header) {
28-
return stringKey("request.header." + header);
27+
public static AttributeKey<String> httpRequestHeader(String header) {
28+
return stringKey("http.request.header." + header);
2929
}
3030

31-
public static AttributeKey<String> responseHeader(String header) {
32-
return stringKey("response.header." + header);
31+
public static AttributeKey<String> httpResponseHeader(String header) {
32+
return stringKey("http.response.header." + header);
3333
}
3434

35-
public static final AttributeKey<String> REQUEST_BODY = stringKey("request.body");
35+
public static final AttributeKey<String> HTTP_REQUEST_BODY = stringKey("http.request.body");
3636

37-
public static final AttributeKey<String> RESPONSE_BODY = stringKey("response.body");
37+
public static final AttributeKey<String> HTTP_RESPONSE_BODY = stringKey("http.response.body");
3838

3939
public static final AttributeKey<Boolean> OPA_RESULT = booleanKey("hypertrace.opa.result");
4040

0 commit comments

Comments
 (0)