Skip to content

Commit 15713a6

Browse files
authored
Add java endpoints to Test_RemoteConfigurationExtraServices (#2911)
1 parent 90d3aab commit 15713a6

File tree

10 files changed

+61
-1
lines changed

10 files changed

+61
-1
lines changed

manifests/java.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,9 @@ tests/:
11621162
TestTracerFlareV1: v1.25.0
11631163
remote_config/:
11641164
test_remote_configuration.py:
1165-
Test_RemoteConfigurationExtraServices: missing_feature
1165+
Test_RemoteConfigurationExtraServices:
1166+
'*': v1.31.0
1167+
spring-boot-3-native: missing_feature (GraalVM. Tracing support only)
11661168
Test_RemoteConfigurationUpdateSequenceASMDD:
11671169
'*': v1.4.0
11681170
spring-boot-3-native: missing_feature (GraalVM. Tracing support only)

utils/build/docker/java/akka-http/src/main/scala/com/datadoghq/akka_http/AppSecRoutes.scala

+8
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ object AppSecRoutes {
3232
complete("Hello world!")
3333
}
3434
}
35+
} ~
36+
path("createextraservice") {
37+
get {
38+
parameter("serviceName") { serviceName =>
39+
setRootSpanTag("service", serviceName)
40+
complete("OK")
41+
}
42+
}
3543
} ~
3644
path("headers") {
3745
get {

utils/build/docker/java/jersey-grizzly2/src/main/java/com/datadoghq/jersey/MyResource.java

+7
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,13 @@ public Response setCookie(@QueryParam("name") String name, @QueryParam("value")
269269
return Response.ok().header("Set-Cookie", name + "=" + value).build();
270270
}
271271

272+
@GET
273+
@Path("/createextraservice")
274+
public String createextraservice(@QueryParam("serviceName") String serviceName) {
275+
setRootSpanTag("service", serviceName);
276+
return "ok";
277+
}
278+
272279
public static final class DistantCallResponse {
273280
public String url;
274281
public int status_code;

utils/build/docker/java/play/app/controllers/AppSecController.scala

+5
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ class AppSecController @Inject()(cc: MessagesControllerComponents, ws: WSClient,
162162
Ok(Json.toJson(headers))
163163
}
164164

165+
def createextraservice(serviceName: String) = Action { request =>
166+
setRootSpanTag("service", serviceName)
167+
Results.Ok("ok")
168+
}
169+
165170
def setCookie(name: Option[String], value: Option[String]) = Action { request =>
166171
val cookieName = name.getOrElse("defaultName")
167172
val cookieValue = value.getOrElse("defaultValue")

utils/build/docker/java/play/conf/routes

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ GET /rasp/sqli controllers.RaspController.sqli
1616
POST /rasp/sqli controllers.RaspController.sqli
1717
GET /requestdownstream controllers.AppSecController.requestdownstream
1818
GET /returnheaders controllers.AppSecController.returnheaders
19+
GET /createextraservice controllers.AppSecController.createextraservice(serviceName: String)

utils/build/docker/java/ratpack/src/main/java/com/datadoghq/ratpack/Main.java

+6
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,12 @@ public static void main(String[] args) throws Exception {
217217

218218
ctx.getResponse().send("application/json", json);
219219
})
220+
.get("createextraservice", ctx -> {
221+
MultiValueMap<String, String> qp = ctx.getRequest().getQueryParams();
222+
String serviceName = qp.get("serviceName");
223+
setRootSpanTag("service", serviceName);
224+
ctx.getResponse().send("ok");
225+
})
220226
.get("set_cookie", ctx -> {
221227
final String name = ctx.getRequest().getQueryParams().get("name");
222228
final String value = ctx.getRequest().getQueryParams().get("value");

utils/build/docker/java/resteasy-netty3/src/main/java/com/datadoghq/resteasy/MyResource.java

+7
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,13 @@ public Response setCookie(@QueryParam("name") String name, @QueryParam("value")
268268
return Response.ok().header("Set-Cookie", name + "=" + value).build();
269269
}
270270

271+
@GET
272+
@Path("/createextraservice")
273+
public String createextraservice(@QueryParam("serviceName") String serviceName) {
274+
setRootSpanTag("service", serviceName);
275+
return "ok";
276+
}
277+
271278
public static final class DistantCallResponse {
272279
public String url;
273280
public int status_code;

utils/build/docker/java/spring-boot/src/main/java/com/datadoghq/system_tests/springboot/App.java

+12
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
import java.util.Map.Entry;
8787
import java.util.Set;
8888

89+
import io.opentracing.Span;
90+
import io.opentracing.util.GlobalTracer;
91+
8992
import static com.mongodb.client.model.Filters.eq;
9093
import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
9194
import static io.opentelemetry.api.trace.StatusCode.ERROR;
@@ -736,6 +739,15 @@ DistantCallResponse make_distant_call(@RequestParam String url) throws Exception
736739
return result;
737740
}
738741

742+
@RequestMapping("/createextraservice")
743+
public String createextraservice(@RequestParam String serviceName) {
744+
final Span span = GlobalTracer.get().activeSpan();
745+
if (span != null) {
746+
span.setTag("service", serviceName);
747+
}
748+
return "OK";
749+
}
750+
739751
public static final class DistantCallResponse {
740752
public String url;
741753
public int status_code;

utils/build/docker/java/vertx3/src/main/java/com/datadoghq/vertx3/Main.java

+6
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,12 @@ public void onResponse(Call call, Response response) throws IOException {
201201
String value = ctx.request().getParam("value");
202202
ctx.response().putHeader("Set-Cookie", name + "=" + value).end("ok");
203203
});
204+
router.get("/createextraservice")
205+
.handler(ctx -> {
206+
String serviceName = ctx.request().getParam("serviceName");
207+
setRootSpanTag("service", serviceName);
208+
ctx.response().end("ok");
209+
});
204210

205211
iastRouteProviders().forEach(provider -> provider.accept(router));
206212
raspRouteProviders().forEach(provider -> provider.accept(router));

utils/build/docker/java/vertx4/src/main/java/com/datadoghq/vertx4/Main.java

+6
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,12 @@ public void onResponse(Call call, Response response) throws IOException {
200200
String value = ctx.request().getParam("value");
201201
ctx.response().putHeader("Set-Cookie", name + "=" + value).end("ok");
202202
});
203+
router.get("/createextraservice")
204+
.handler(ctx -> {
205+
String serviceName = ctx.request().getParam("serviceName");
206+
setRootSpanTag("service", serviceName);
207+
ctx.response().end("ok");
208+
});
203209

204210
iastRouteProviders().forEach(provider -> provider.accept(router));
205211
raspRouteProviders().forEach(provider -> provider.accept(router));

0 commit comments

Comments
 (0)