Remove manual tracing instrumentation.

Use the Java Agent instead.
This commit is contained in:
Andreas Svanberg 2022-09-28 14:58:53 +02:00
parent 09dbaff940
commit fc76a7ec98
7 changed files with 8 additions and 43 deletions
core
pom.xml
src
main/java/se/su/dsv/scipro
test/java/se/su/dsv/scipro/daisyExternal/http
daisy-integration/src
main/java/se/su/dsv/scipro/integration/daisy/workers
test/java/se/su/dsv/scipro/integration/daisy/workers

@ -139,11 +139,6 @@
<artifactId>jackson-datatype-jdk8</artifactId>
</dependency>
<dependency>
<groupId>io.opentracing.contrib</groupId>
<artifactId>opentracing-jaxrs2</artifactId>
<version>0.5.0</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>

@ -1,9 +1,9 @@
package se.su.dsv.scipro.daisyExternal;
import com.google.inject.*;
import com.google.inject.Key;
import com.google.inject.PrivateModule;
import com.google.inject.Scopes;
import com.google.inject.name.Names;
import io.opentracing.Tracer;
import io.opentracing.noop.NoopTracerFactory;
import se.su.dsv.scipro.daisyExternal.http.DaisyAPI;
import se.su.dsv.scipro.daisyExternal.http.DaisyAPIImpl;
@ -16,12 +16,5 @@ public class DaisyExternalModule extends PrivateModule {
bind(DaisyAPI.class).to(DaisyAPIImpl.class).in(Scopes.SINGLETON);
expose(DaisyAPI.class);
expose(Tracer.class);
}
@Provides
@Singleton
public Tracer getTracer() {
return NoopTracerFactory.create();
}
}

@ -1,7 +1,5 @@
package se.su.dsv.scipro.daisyExternal.http;
import io.opentracing.Tracer;
import io.opentracing.contrib.jaxrs2.client.ClientTracingFeature;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
import se.su.dsv.scipro.io.dto.AddThesisAuthor;
import se.su.dsv.scipro.io.dto.CourseRegistration;
@ -63,13 +61,11 @@ public class DaisyAPIImpl implements DaisyAPI {
public DaisyAPIImpl(
@Named("daisy.api.url") final String baseUrl,
@Named("daisy.api.username") final String user,
@Named("daisy.api.password") final String password,
final Tracer tracer)
@Named("daisy.api.password") final String password)
{
this.baseUrl = baseUrl;
this.client = ClientBuilder.newClient()
.register(HttpAuthenticationFeature.basic(user, password))
.register(new ClientTracingFeature.Builder(tracer).build());
.register(HttpAuthenticationFeature.basic(user, password));
this.objectFactory = new ObjectFactory();
}

@ -1,7 +1,5 @@
package se.su.dsv.scipro.grading;
import io.opentracing.Tracer;
import io.opentracing.contrib.jaxrs2.client.ClientTracingFeature;
import org.glassfish.jersey.jackson.JacksonFeature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -27,13 +25,12 @@ public class GradingServiceImpl implements GradingService {
private final Client client;
@Inject
public GradingServiceImpl(@Named("service.grading.url") final String url, final Tracer tracer) {
public GradingServiceImpl(@Named("service.grading.url") final String url) {
this.url = url;
this.client = ClientBuilder.newBuilder()
.hostnameVerifier((hostname, sslSession) -> true)
.register(JacksonFeature.class)
.register(new ClientTracingFeature.Builder(tracer).build())
.build();
}

@ -1,7 +1,6 @@
package se.su.dsv.scipro.daisyExternal.http;
import com.sun.net.httpserver.HttpServer;
import io.opentracing.noop.NoopTracerFactory;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.io.dto.Person;
import se.su.dsv.scipro.io.dto.ProjectParticipant;
@ -276,7 +275,7 @@ public class DaisyAPIImplTest {
private DaisyAPIImpl getDaisyAPI(HttpServer httpServer) {
String uri = "http://" + httpServer.getAddress().getHostName() + ":" + httpServer.getAddress().getPort();
return new DaisyAPIImpl(uri, "user", "password", NoopTracerFactory.create());
return new DaisyAPIImpl(uri, "user", "password");
}
private HttpServer fakeRemoteServerWithXmlResponse(String xml) throws IOException {

@ -1,8 +1,5 @@
package se.su.dsv.scipro.integration.daisy.workers;
import io.opentracing.Scope;
import io.opentracing.Span;
import io.opentracing.Tracer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import se.su.dsv.scipro.daisyExternal.ExternalImporter;
@ -38,7 +35,6 @@ public class UserImportWorker extends AbstractWorker {
private final ImporterTransactions importerTransactions;
private final ExternalImporter externalImporter;
private final UserService userService;
private final Tracer tracer;
private final MergeService mergeService;
private final ProgramService programService;
private final Provider<EntityManager> entityManagerProvider;
@ -48,7 +44,6 @@ public class UserImportWorker extends AbstractWorker {
public UserImportWorker(DaisyAPI daisyAPI,
ImporterTransactions importerTransactions,
ExternalImporter externalImporter,
final Tracer tracer,
final MergeService mergeService,
UserService userService,
ProgramService programService,
@ -59,7 +54,6 @@ public class UserImportWorker extends AbstractWorker {
this.importerTransactions = importerTransactions;
this.externalImporter = externalImporter;
this.userService = userService;
this.tracer = tracer;
this.mergeService = mergeService;
this.programService = programService;
this.entityManagerProvider = entityManagerProvider;
@ -100,11 +94,7 @@ public class UserImportWorker extends AbstractWorker {
private void importUserDetails(final Map<Integer, Program> programCache) {
for (final User user : userService.findAll()) {
if (user.getIdentifier() != null) {
final Span span = tracer.buildSpan("Importing user")
.withTag("scipro.user.id", user.getId())
.withTag("daisy.user.id", user.getIdentifier())
.start();
try (Scope ignored = tracer.activateSpan(span)) {
try {
Optional<Person> idPerson = daisyAPI.findPersonById(user.getIdentifier());
if (idPerson.isPresent()) {
Person person = idPerson.get();
@ -122,7 +112,6 @@ public class UserImportWorker extends AbstractWorker {
User duplicatedUser = userService.findByExternalIdentifier(usernamePerson.get().getId());
if (duplicatedUser != null) {
LOGGER.info("User {} ({}) already exist in SciPro", user, user.getIdentifier());
span.setTag("merge", true);
mergeService.mergeUsers(user, duplicatedUser);
}
else {
@ -136,8 +125,6 @@ public class UserImportWorker extends AbstractWorker {
}
} catch (RuntimeException e) {
LOGGER.info("Failed to re-import user {} ({})", user, user.getIdentifier(), e);
} finally {
span.finish();
}
}
}

@ -1,6 +1,5 @@
package se.su.dsv.scipro.integration.daisy.workers;
import io.opentracing.noop.NoopTracerFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ -53,7 +52,6 @@ public class UserImportWorkerTest {
daisyAPI,
importerTransactions,
externalImporter,
NoopTracerFactory.create(),
mergeService,
userService,
programService,