ACS-2002 Add T-Engine debug for local transforms

[trigger release] 2.5.7-A7
This commit is contained in:
alandavis 2022-03-05 10:19:45 +00:00
parent ed5c00b98b
commit d1c6015913
2 changed files with 23 additions and 8 deletions

View File

@ -64,6 +64,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import static java.util.stream.Collectors.joining;
import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setOrClearCoreVersion;
@ -148,6 +149,8 @@ public abstract class AbstractTransformerController implements TransformControll
@Autowired
private TransformerDebug transformerDebug;
private AtomicInteger httpRequestCount = new AtomicInteger(1);
@GetMapping(value = ENDPOINT_TRANSFORM_CONFIG)
public ResponseEntity<TransformConfig> info(
@RequestParam(value = CONFIG_VERSION, defaultValue = CONFIG_VERSION_DEFAULT) int configVersion)
@ -202,6 +205,11 @@ public abstract class AbstractTransformerController implements TransformControll
Map<String, String> transformOptions = getTransformOptions(requestParameters);
String transformName = getTransformerName(sourceMimetype, targetMimetype, requestTransformName, sourceFile, transformOptions);
String reference = "e"+Integer.toString(httpRequestCount.getAndIncrement());
transformerDebug.pushTransform(reference, sourceMimetype, targetMimetype, sourceFile, transformName);
transformerDebug.logOptions(reference, transformOptions);
try
{
transformImpl(transformName, sourceMimetype, targetMimetype, transformOptions, sourceFile, targetFile);
final ResponseEntity<Resource> body = createAttachment(targetFilename, targetFile);
@ -209,8 +217,15 @@ public abstract class AbstractTransformerController implements TransformControll
long time = LogEntry.setStatusCodeAndMessage(OK.value(), "Success");
time += LogEntry.addDelay(testDelay);
getProbeTestTransform().recordTransformTime(time);
transformerDebug.popTransform(reference, time);
return body;
}
catch (Throwable t)
{
transformerDebug.logFailure(reference, t.getMessage());
throw t;
}
}
private File getSourceFileFromDirectUrl(String directUrl)
{

View File

@ -22,7 +22,7 @@
<dependency.pdfbox.version>2.0.25</dependency.pdfbox.version>
<dependency.alfresco-jodconverter-core.version>3.0.1.12</dependency.alfresco-jodconverter-core.version>
<env.project_version>${project.version}</env.project_version>
<dependency.alfresco-transform-model.version>1.4.13</dependency.alfresco-transform-model.version>
<dependency.alfresco-transform-model.version>1.4.14</dependency.alfresco-transform-model.version>
<dependency.activemq.version>5.16.4</dependency.activemq.version>
<dependency.jackson.version>2.13.1</dependency.jackson.version>
<dependency.jackson-databind.version>${dependency.jackson.version}</dependency.jackson-databind.version>