From dc8d66dda92ff2b667d301c7016bd6142eacb46c Mon Sep 17 00:00:00 2001 From: "ci.logs-backend" Date: Thu, 10 Aug 2023 12:55:35 +0200 Subject: [PATCH 01/14] Implement Java tracer auto-configuration --- .../datadog/DatadogGlobalConfiguration.java | 153 ++++++++++- .../plugins/datadog/clients/HttpClient.java | 24 +- .../tracer/DatadogTracerConfigurator.java | 255 ++++++++++++++++++ .../DatadogTracerEnvironmentContributor.java | 33 +++ .../tracer/DatadogTracerJobProperty.java | 68 +++++ .../tracer/DatadogTracerJobPropertyInfo.java | 43 +++ ...tadogTracerStepEnvironmentContributor.java | 27 ++ .../DatadogGlobalConfiguration/config.jelly | 8 + .../help-apiKeyEntry.html | 4 - .../help-credentialsApiKeyEntry.html | 6 - .../help-targetApiKeyEntry.html | 4 + .../help-targetApplicationKeyEntry.html | 4 + .../help-targetCredentialsApiKeyEntry.html | 6 + ...-targetCredentialsApplicationKeyEntry.html | 6 + .../DatadogTracerJobProperty/config.jelly | 15 ++ .../DatadogTracerJobProperty/help-on.html | 5 + .../DatadogTracerJobPropertyInfo/config.jelly | 8 + .../help-serviceName.html | 4 + 18 files changed, 658 insertions(+), 15 deletions(-) create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerEnvironmentContributor.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerStepEnvironmentContributor.java delete mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-apiKeyEntry.html delete mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-credentialsApiKeyEntry.html create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApiKeyEntry.html create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApiKeyEntry.html create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/config.jelly create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/help-serviceName.html diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration.java b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration.java index 344c95c2f..51d6d897d 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration.java @@ -90,6 +90,7 @@ public class DatadogGlobalConfiguration extends GlobalConfiguration { private static final String TARGET_LOG_INTAKE_URL_PROPERTY = "DATADOG_JENKINS_PLUGIN_TARGET_LOG_INTAKE_URL"; private static final String TARGET_WEBHOOK_INTAKE_URL_PROPERTY = "DATADOG_JENKINS_TARGET_WEBHOOK_INTAKE_URL"; private static final String TARGET_API_KEY_PROPERTY = "DATADOG_JENKINS_PLUGIN_TARGET_API_KEY"; + private static final String TARGET_APPLICATION_KEY_PROPERTY = "DATADOG_JENKINS_PLUGIN_TARGET_APPLICATION_KEY"; private static final String TARGET_LOG_COLLECTION_PORT_PROPERTY = "DATADOG_JENKINS_PLUGIN_TARGET_LOG_COLLECTION_PORT"; private static final String TARGET_TRACE_SERVICE_NAME_PROPERTY = "DATADOG_JENKINS_PLUGIN_TRACE_SERVICE_NAME"; private static final String HOSTNAME_PROPERTY = "DATADOG_JENKINS_PLUGIN_HOSTNAME"; @@ -140,6 +141,9 @@ public class DatadogGlobalConfiguration extends GlobalConfiguration { private Secret targetApiKey = null; private String targetCredentialsApiKey = null; private Secret usedApiKey = null; + private Secret targetApplicationKey = null; + private String targetCredentialsApplicationKey = null; + private Secret usedApplicationKey = null; private String targetHost = DEFAULT_TARGET_HOST_VALUE; private Integer targetPort = DEFAULT_TARGET_PORT_VALUE; private Integer targetLogCollectionPort = DEFAULT_TARGET_LOG_COLLECTION_PORT_VALUE; @@ -195,6 +199,11 @@ private void loadEnvVariables(){ this.targetApiKey = Secret.fromString(targetApiKeyEnvVar); } + String targetApplicationKeyEnvVar = System.getenv(TARGET_APPLICATION_KEY_PROPERTY); + if(StringUtils.isNotBlank(targetApplicationKeyEnvVar)){ + this.targetApplicationKey = Secret.fromString(targetApplicationKeyEnvVar); + } + final DatadogAgentConfiguration agentConfig = DatadogAgentConfiguration.resolve(System.getenv()); if(StringUtils.isNotBlank(agentConfig.getHost())){ this.targetHost = agentConfig.getHost(); @@ -214,7 +223,7 @@ private void loadEnvVariables(){ } String traceServiceNameVar = System.getenv(TARGET_TRACE_SERVICE_NAME_PROPERTY); - if(StringUtils.isNotBlank(targetApiKeyEnvVar)) { + if(StringUtils.isNotBlank(traceServiceNameVar)) { this.traceServiceName = traceServiceNameVar; } @@ -455,7 +464,6 @@ public ListBoxModel doFillTargetCredentialsApiKeyItems( .includeCurrentValue(targetCredentialsApiKey); } - /** * Tests the targetCredentialsApiKey field from the configuration screen, to check its' validity. * @@ -477,7 +485,7 @@ public FormValidation doCheckTargetCredentialsApiKey( } else { if (!item.hasPermission(Item.EXTENDED_READ) && !item.hasPermission(CredentialsProvider.USE_ITEM)) { - return FormValidation.ok(); + return FormValidation.ok(); } } if (StringUtils.isBlank(targetCredentialsApiKey)) { @@ -488,7 +496,7 @@ public FormValidation doCheckTargetCredentialsApiKey( } if (CredentialsProvider.listCredentials(StringCredentials.class, item, - ACL.SYSTEM, + ACL.SYSTEM, Collections.emptyList(), CredentialsMatchers.withId(targetCredentialsApiKey)).isEmpty()) { return FormValidation.error("Cannot find currently selected credentials"); @@ -496,6 +504,78 @@ public FormValidation doCheckTargetCredentialsApiKey( return FormValidation.ok(); } + /** + * Populates the targetCredentialsApplicationKey field from the configuration screen with all of the valid credentials + * + * @param item - The context within which to list available credentials + * @param targetCredentialsApplicationKey - A String containing the application key as a credential + * @return a ListBoxModel object used to display all of the available credentials. + */ + public ListBoxModel doFillTargetCredentialsApplicationKeyItems( + @AncestorInPath Item item, + @QueryParameter("targetCredentialsApplicationKey") String targetCredentialsApplicationKey + ) { + StandardListBoxModel result = new StandardListBoxModel(); + // If the users does not have permissions to list credentials, only list the current value + if (item == null) { + if (!Jenkins.get().hasPermission(Jenkins.ADMINISTER)) { + return result.includeCurrentValue(targetCredentialsApplicationKey); + } + } else { + if (!item.hasPermission(Item.EXTENDED_READ) + && !item.hasPermission(CredentialsProvider.USE_ITEM)) { + return result.includeCurrentValue(targetCredentialsApplicationKey); + } + } + return result.includeEmptyValue() + .includeMatchingAs(ACL.SYSTEM, + Jenkins.get(), + StringCredentials.class, + Collections.emptyList(), + CredentialsMatchers.instanceOf(StringCredentials.class)) + .includeCurrentValue(targetCredentialsApplicationKey); + } + + /** + * Tests the targetCredentialsApplicationKey field from the configuration screen, to check its' validity. + * + * @param item - The context within which to list available credentials. + * @param targetCredentialsApplicationKey - A String containing the API key as a credential + * @return a FormValidation object used to display a message to the user on the configuration + * screen. + */ + @RequirePOST + public FormValidation doCheckTargetCredentialsApplicationKey( + @AncestorInPath Item item, + @QueryParameter("targetCredentialsApplicationKey") String targetCredentialsApplicationKey + ) { + // Don't validate for users that do not have permission to list credentials + if (item == null) { + if (!Jenkins.get().hasPermission(Jenkins.ADMINISTER)) { + return FormValidation.ok(); + } + } else { + if (!item.hasPermission(Item.EXTENDED_READ) + && !item.hasPermission(CredentialsProvider.USE_ITEM)) { + return FormValidation.ok(); + } + } + if (StringUtils.isBlank(targetCredentialsApplicationKey)) { + return FormValidation.ok(); + } + if (targetCredentialsApplicationKey.startsWith("${") && targetCredentialsApplicationKey.endsWith("}")) { + return FormValidation.warning("Cannot validate expression based credentials"); + } + if (CredentialsProvider.listCredentials(StringCredentials.class, + item, + ACL.SYSTEM, + Collections.emptyList(), + CredentialsMatchers.withId(targetCredentialsApplicationKey)).isEmpty()) { + return FormValidation.error("Cannot find currently selected credentials"); + } + return FormValidation.ok(); + } + /** * Tests the hostname field from the configuration screen, to determine if * the hostname is of a valid format, according to the RFC 1123. @@ -685,6 +765,8 @@ public boolean configure(final StaplerRequest req, final JSONObject formData) th this.setTargetWebhookIntakeURL(formData.getString("targetWebhookIntakeURL")); this.setTargetApiKey(formData.getString("targetApiKey")); this.setTargetCredentialsApiKey(formData.getString("targetCredentialsApiKey")); + this.setTargetApplicationKey(formData.getString("targetApplicationKey")); + this.setTargetCredentialsApplicationKey(formData.getString("targetCredentialsApplicationKey")); this.setTargetHost(formData.getString("targetHost")); String portStr = formData.getString("targetPort"); if (validatePort(portStr)) { @@ -766,6 +848,10 @@ public boolean configure(final StaplerRequest req, final JSONObject formData) th final Secret apiKeySecret = findSecret(formData.getString("targetApiKey"), formData.getString("targetCredentialsApiKey")); this.setUsedApiKey(apiKeySecret); + + final Secret applicationKeySecret = findSecret(formData.getString("targetApplicationKey"), formData.getString("targetCredentialsApplicationKey")); + this.setUsedApplicationKey(applicationKeySecret); + //When form is saved.... DatadogClient client = ClientFactory.getClient(DatadogClient.ClientType.valueOf(this.getReportWith()), this.getTargetApiURL(), this.getTargetLogIntakeURL(), this.getTargetWebhookIntakeURL(), this.getUsedApiKey(), this.getTargetHost(), @@ -930,6 +1016,65 @@ public void setTargetCredentialsApiKey(final String targetCredentialsApiKey) { this.targetCredentialsApiKey = targetCredentialsApiKey; } + /** + * Getter function for the targetApplicationKey global configuration. + * + * @return a Secret containing the targetApplicationKey global configuration. + */ + public Secret getTargetApplicationKey() { + return targetApplicationKey; + } + + /** + * Setter function for the targetApplicationKey global configuration. + * + * @param targetApplicationKey = A string containing the plaintext representation of a + * DataDog Application Key + */ + @DataBoundSetter + public void setTargetApplicationKey(final String targetApplicationKey) { + this.targetApplicationKey = Secret.fromString(fixEmptyAndTrim(targetApplicationKey)); + } + + /** + * Getter function for the application key global configuration. + * + * @return a Secret containing the usedApplicationKey global configuration. + */ + public Secret getUsedApplicationKey() { + return usedApplicationKey; + } + + /** + * Setter function for the application key global configuration.. + * + * @param usedApplicationKey = A Secret containing the DataDog Application Key + */ + @DataBoundSetter + public void setUsedApplicationKey(final Secret usedApplicationKey) { + this.usedApplicationKey = usedApplicationKey; + } + + /** + * Getter function for the targetCredentialsApplicationKey global configuration. + * + * @return a String containing the ID of the targetCredentialsApplicationKey global configuration. + */ + public String getTargetCredentialsApplicationKey() { + return targetCredentialsApplicationKey; + } + + /** + * Setter function for the credentials targetCredentialsApplicationKey global configuration. + * + * @param targetCredentialsApplicationKey = A string containing the plaintext representation of a + * DataDog Application Key + */ + @DataBoundSetter + public void setTargetCredentialsApplicationKey(final String targetCredentialsApplicationKey) { + this.targetCredentialsApplicationKey = targetCredentialsApplicationKey; + } + /** * Getter function for the targetHost global configuration. * diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/clients/HttpClient.java b/src/main/java/org/datadog/jenkins/plugins/datadog/clients/HttpClient.java index ad24a70a2..95f140636 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/clients/HttpClient.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/clients/HttpClient.java @@ -1,5 +1,7 @@ package org.datadog.jenkins.plugins.datadog.clients; +import java.io.IOException; +import java.io.InputStream; import java.util.Collections; import java.util.List; import java.util.Map; @@ -10,6 +12,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; import java.util.logging.Logger; @@ -26,6 +29,7 @@ import org.eclipse.jetty.client.api.Result; import org.eclipse.jetty.client.util.BufferingResponseListener; import org.eclipse.jetty.client.util.BytesContentProvider; +import org.eclipse.jetty.client.util.InputStreamResponseListener; import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; @@ -152,7 +156,7 @@ public boolean matches(Origin origin) { return false; } } - return true; + return super.matches(origin); } }); } @@ -182,6 +186,24 @@ public T get(String url, Map headers, Function re responseParser); } + public void getBinary(String url, Map headers, Consumer responseParser) throws ExecutionException, InterruptedException, TimeoutException, IOException { + ensureProxyConfiguration(); + + Request request = requestSupplier(url, HttpMethod.GET, headers, null, null).get(); + InputStreamResponseListener responseListener = new InputStreamResponseListener(); + request.send(responseListener); + + Response response = responseListener.get(timeoutMillis, TimeUnit.MILLISECONDS); + int responseStatus = response.getStatus(); + if (responseStatus >= 200 && responseStatus < 300) { + try (InputStream responseStream = responseListener.getInputStream()) { + responseParser.accept(responseStream); + } + } else { + throw new ResponseProcessingException("Received erroneous response " + response); + } + } + public T post(String url, Map headers, String contentType, byte[] body, Function responseParser) throws ExecutionException, InterruptedException, TimeoutException { return executeSynchronously( requestSupplier(url, HttpMethod.POST, headers, contentType, body), diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java new file mode 100644 index 000000000..9791c4e87 --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java @@ -0,0 +1,255 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import hudson.FilePath; +import hudson.model.AbstractBuild; +import hudson.model.AbstractProject; +import hudson.model.InvisibleAction; +import hudson.model.Job; +import hudson.model.Node; +import hudson.model.Run; +import hudson.model.TopLevelItem; +import hudson.util.Secret; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; +import jenkins.model.Jenkins; +import org.datadog.jenkins.plugins.datadog.DatadogClient; +import org.datadog.jenkins.plugins.datadog.DatadogGlobalConfiguration; +import org.datadog.jenkins.plugins.datadog.DatadogUtilities; +import org.datadog.jenkins.plugins.datadog.clients.HttpClient; + +public class DatadogTracerConfigurator { + + private static final Logger LOGGER = Logger.getLogger(DatadogTracerConfigurator.class.getName()); + + private static final String TRACER_DISTRIBUTION_URL = "https://dtdg.co/latest-java-tracer"; + private static final String TRACER_FILE_NAME = "dd-java-agent.jar"; + private static final String TRACER_JAR_CACHE_TTL_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_JAR_CACHE_TTL_MINUTES"; + private static final int DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES = 60 * 12; + + private final HttpClient httpClient = new HttpClient(60_000); + + public static final DatadogTracerConfigurator INSTANCE = new DatadogTracerConfigurator(); + + public Map configure(Run run, Node node, Map envs) { + Job job = run.getParent(); + DatadogTracerJobProperty property = job.getProperty(DatadogTracerJobProperty.class); + if (property == null || !property.isOn()) { + return Collections.emptyMap(); + } + + for (ConfigureTracerAction action : run.getActions(ConfigureTracerAction.class)) { + if (action.node == node) { + return action.variables; + } + } + + DatadogTracerJobPropertyInfo info = property.getInfo(); + Map variables = doConfigure(info, run, node, envs); + run.addAction(new ConfigureTracerAction(node, variables)); + return variables; + } + + private Map doConfigure(DatadogTracerJobPropertyInfo info, Run run, Node node, Map envs) { + try { + FilePath tracerFile = downloadTracer(run, node); + return createEnvVariables(info, node, tracerFile, envs); + } catch (Exception e) { + LOGGER.log(Level.INFO, "Error while configuring Datadog Tracer for run " + run + " and node " + node, e); + return Collections.emptyMap(); + } + } + + private FilePath downloadTracer(Run run, Node node) throws Exception { + TopLevelItem topLevelItem = getTopLevelItem(run); + FilePath workspacePath = node.getWorkspaceFor(topLevelItem); + if (workspacePath == null) { + throw new IllegalStateException("Cannot find workspace path for " + topLevelItem + " on " + node); + } + + FilePath datadogFolder = workspacePath.child(".datadog"); + datadogFolder.mkdirs(); + + FilePath datadogTracerFile = datadogFolder.child(TRACER_FILE_NAME); + long minutesSinceModification = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - datadogTracerFile.lastModified()); + if (minutesSinceModification < getTracerJarCacheTtlMinutes()) { + // downloaded tracer is fresh enough + return datadogTracerFile.absolutize(); + } + + httpClient.getBinary(TRACER_DISTRIBUTION_URL, Collections.emptyMap(), is -> { + try { + datadogTracerFile.copyFrom(is); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + return datadogTracerFile.absolutize(); + } + + private int getTracerJarCacheTtlMinutes() { + String envVariable = System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); + if (envVariable != null) { + try { + return Integer.parseInt(envVariable); + } catch (Exception e) { + // ignored + } + } + return DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES; + } + + private static TopLevelItem getTopLevelItem(Run run) { + if (run instanceof AbstractBuild) { + AbstractBuild build = (AbstractBuild) run; + AbstractProject project = build.getProject(); + if (project instanceof TopLevelItem) { + return (TopLevelItem) project; + } else { + throw new IllegalArgumentException("Unexpected type of project: " + project); + } + } else { + Job parent = run.getParent(); + if (parent instanceof TopLevelItem) { + return (TopLevelItem) parent; + } else { + throw new IllegalArgumentException("Unexpected type of run parent: " + parent); + } + } + } + + private static Map createEnvVariables(DatadogTracerJobPropertyInfo info, Node node, FilePath tracerFile, Map envs) { + DatadogGlobalConfiguration datadogConfig = DatadogUtilities.getDatadogGlobalDescriptor(); + if (datadogConfig == null) { + LOGGER.log(Level.INFO, "Cannot set up tracer: Datadog config not found"); + return Collections.emptyMap(); + } + + Map variables = new HashMap<>(); + variables.put("DD_CIVISIBILITY_ENABLED", "true"); + variables.put("DD_ENV", "ci"); + variables.put("DD_SERVICE", info.getServiceName()); + + String tracerAgent = "-javaagent:" + tracerFile.getRemote(); + variables.put("MAVEN_OPTS", prepend(envs, "MAVEN_OPTS", tracerAgent)); + variables.put("GRADLE_OPTS", prepend(envs, "GRADLE_OPTS", "-Dorg.gradle.jvmargs=" + tracerAgent)); + + DatadogClient.ClientType clientType = DatadogClient.ClientType.valueOf(datadogConfig.getReportWith()); + switch (clientType) { + case HTTP: + variables.put("DD_CIVISIBILITY_AGENTLESS_ENABLED", "true"); + variables.put("DD_SITE", getSite(datadogConfig.getTargetApiURL())); + variables.put("DD_API_KEY", Secret.toString(datadogConfig.getUsedApiKey())); + variables.put("DD_APPLICATION_KEY", Secret.toString(datadogConfig.getUsedApplicationKey())); + break; + case DSD: + variables.put("DD_AGENT_HOST", datadogConfig.getTargetHost()); + variables.put("DD_TRACE_AGENT_PORT", getAgentPort(datadogConfig.getTargetTraceCollectionPort())); + break; + default: + throw new IllegalArgumentException("Unexpected client type: " + clientType); + } + + String proxyConfiguration = getProxyConfiguration(node); + if (proxyConfiguration != null) { + variables.put("JAVA_TOOL_OPTIONS", prepend(envs, "JAVA_TOOL_OPTIONS", proxyConfiguration)); + } + + // FIXME nikita: consider adding fields for additional tracer properties to config section (DatadogTracerJobPropertyInfo) + // see http://localhost:8080/computer/(built-in)/configure - Node Properties - Environment Variable for an example of dynamic list + + // FIXME nikita: see if I can maybe group Tagging and Test Visibility settings in one Datadog section + + return variables; + } + + private static String prepend(Map envs, String propertyName, String propertyValue) { + String existingPropertyValue = envs.get(propertyName); + return propertyValue + (existingPropertyValue != null ? " " + existingPropertyValue : ""); + } + + private static String getSite(String apiUrl) { + // what users configure for Pipelines looks like "https://api.datadoghq.com/api/" + // while what the tracer needs "datadoghq.com" + try { + URI uri = new URL(apiUrl).toURI(); + String host = uri.getHost(); + if (host == null) { + throw new IllegalArgumentException("Cannot find host in Datadog API URL: " + uri); + } + + String[] parts = host.split("\\."); + return (parts.length >= 2 ? parts[parts.length - 2] + "." : "") + parts[parts.length - 1]; + + } catch (MalformedURLException | URISyntaxException e) { + throw new IllegalArgumentException("Cannot parse Datadog API URL", e); + } + } + + private static String getAgentPort(Integer traceCollectionPort) { + if (traceCollectionPort == null) { + throw new IllegalArgumentException("Traces collection port is not set"); + } else { + return traceCollectionPort.toString(); + } + } + + private static String getProxyConfiguration(Node node) { + if (!(node instanceof Jenkins)) { + // only apply Jenkins proxy settings if tracer will be run on master node + return null; + } + + Jenkins jenkins = Jenkins.getInstanceOrNull(); + if (jenkins == null) { + return null; + } + hudson.ProxyConfiguration jenkinsProxyConfiguration = jenkins.getProxy(); + if (jenkinsProxyConfiguration == null) { + return null; + } + + String proxyHost = jenkinsProxyConfiguration.getName(); + int proxyPort = jenkinsProxyConfiguration.getPort(); + String noProxyHost = jenkinsProxyConfiguration.getNoProxyHost(); + String userName = jenkinsProxyConfiguration.getUserName(); + Secret password = jenkinsProxyConfiguration.getSecretPassword(); + + StringBuilder proxyOptions = new StringBuilder(); + if (proxyHost != null) { + proxyOptions.append("-Dhttp.proxyHost=").append(proxyHost); + } + if (proxyPort > 0) { + proxyOptions.append("-Dhttp.proxyPort=").append(proxyPort); + } + if (noProxyHost != null) { + proxyOptions.append("-Dhttp.nonProxyHosts=").append(noProxyHost); + } + if (userName != null) { + proxyOptions.append("-Dhttp.proxyUser=").append(userName); + } + if (password != null) { + proxyOptions.append("-Dhttp.proxyPassword=").append(Secret.toString(password)); + } + return proxyOptions.length() > 0 ? proxyOptions.toString() : null; + } + + private static final class ConfigureTracerAction extends InvisibleAction { + private final Node node; + private final Map variables; + + private ConfigureTracerAction(Node node, Map variables) { + this.node = node; + this.variables = variables; + } + } + +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerEnvironmentContributor.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerEnvironmentContributor.java new file mode 100644 index 000000000..ef8d1332f --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerEnvironmentContributor.java @@ -0,0 +1,33 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.EnvVars; +import hudson.Extension; +import hudson.model.EnvironmentContributor; +import hudson.model.Executor; +import hudson.model.Node; +import hudson.model.Run; +import hudson.model.TaskListener; +import java.util.Map; +import org.jenkinsci.plugins.workflow.job.WorkflowRun; + +@Extension +public class DatadogTracerEnvironmentContributor extends EnvironmentContributor { + + @Override + public void buildEnvironmentFor(@NonNull Run run, @NonNull EnvVars envs, @NonNull TaskListener listener) { + if (run instanceof WorkflowRun) { + // Pipelines are handled by org.datadog.jenkins.plugins.datadog.tracer.DatadogTracerStepEnvironmentContributor + return; + } + + Executor executor = run.getExecutor(); + if (executor == null) { + return; + } + + Node node = executor.getOwner().getNode(); + Map additionalEnvVars = DatadogTracerConfigurator.INSTANCE.configure(run, node, envs); + envs.putAll(additionalEnvVars); + } +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java new file mode 100644 index 000000000..5a306ef66 --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java @@ -0,0 +1,68 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.Extension; +import hudson.model.Job; +import hudson.model.JobProperty; +import hudson.model.JobPropertyDescriptor; +import net.sf.json.JSONObject; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.DataBoundSetter; +import org.kohsuke.stapler.StaplerRequest; + +public class DatadogTracerJobProperty> extends JobProperty { + + private static final String DISPLAY_NAME = "Enable Datadog Test Visibility"; + + @NonNull + private DatadogTracerJobPropertyInfo info = new DatadogTracerJobPropertyInfo(); + + private boolean on; + + public DatadogTracerJobProperty() {} + + @DataBoundConstructor + public DatadogTracerJobProperty(DatadogTracerJobPropertyInfo info) { + this.info = info; + } + + @DataBoundSetter + public void setOn(boolean on) { + this.on = on; + } + + public boolean isOn() { + return on; + } + + @DataBoundSetter + public void setInfo(DatadogTracerJobPropertyInfo info) { + this.info = info; + } + + @NonNull + public DatadogTracerJobPropertyInfo getInfo() { + return info; + } + + @Extension + public static final class DatadogTracerJobPropertyDescriptor extends JobPropertyDescriptor { + @Override + public String getDisplayName() { + return DISPLAY_NAME; + } + + @Override + public boolean isApplicable(Class jobType) { + return true; + } + + @Override + public DatadogTracerJobProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException { + if (formData.optBoolean("on")) { + return (DatadogTracerJobProperty) super.newInstance(req, formData); + } + return null; + } + } +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo.java new file mode 100644 index 000000000..2cb06674f --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo.java @@ -0,0 +1,43 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import hudson.Extension; +import hudson.model.Describable; +import hudson.model.Descriptor; +import jenkins.model.Jenkins; +import org.kohsuke.stapler.DataBoundConstructor; +import org.kohsuke.stapler.DataBoundSetter; + +public class DatadogTracerJobPropertyInfo implements Describable { + + private String serviceName; + + public DatadogTracerJobPropertyInfo() {} + + @DataBoundConstructor + public DatadogTracerJobPropertyInfo(String serviceName) { + this.serviceName = serviceName; + } + + @DataBoundSetter + public DatadogTracerJobPropertyInfo setServiceName(String serviceName) { + this.serviceName = serviceName; + return this; + } + + public String getServiceName() { + return serviceName; + } + + @Override + public Descriptor getDescriptor() { + return Jenkins.get().getDescriptorByType(DatadogTracerJobPropertyInfoDescriptor.class); + } + + @Extension + public static class DatadogTracerJobPropertyInfoDescriptor extends Descriptor { + @Override + public String getDisplayName() { + return "DatadogTracerJobPropertyInfo"; + } + } +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerStepEnvironmentContributor.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerStepEnvironmentContributor.java new file mode 100644 index 000000000..42334311e --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerStepEnvironmentContributor.java @@ -0,0 +1,27 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.EnvVars; +import hudson.Extension; +import hudson.model.Node; +import hudson.model.Run; +import hudson.model.TaskListener; +import java.io.IOException; +import java.util.Map; +import org.jenkinsci.plugins.workflow.steps.StepContext; +import org.jenkinsci.plugins.workflow.steps.StepEnvironmentContributor; + +@Extension +public class DatadogTracerStepEnvironmentContributor extends StepEnvironmentContributor { + + @Override + public void buildEnvironmentFor(StepContext stepContext, @NonNull EnvVars envs, @NonNull TaskListener listener) throws IOException, InterruptedException { + Run run = stepContext.get(Run.class); + Node node = stepContext.get(Node.class); + if (run != null && node != null) { + Map additionalEnvVars = DatadogTracerConfigurator.INSTANCE.configure(run, node, envs); + envs.putAll(additionalEnvVars); + } + } + +} diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly index e972a9fb9..191f675ee 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly @@ -59,7 +59,15 @@ + + + + + + + + diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-apiKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-apiKeyEntry.html deleted file mode 100644 index a8af7252e..000000000 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-apiKeyEntry.html +++ /dev/null @@ -1,4 +0,0 @@ -
- Enter your Datadog API key, which can be found - here. -
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-credentialsApiKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-credentialsApiKeyEntry.html deleted file mode 100644 index 55b35ffe9..000000000 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-credentialsApiKeyEntry.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Enter your Datadog API key, which can be found - here. - This field is optional, use it only if you would like to store your API key with - Jenkins Credentials. -
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApiKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApiKeyEntry.html new file mode 100644 index 000000000..85559287d --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApiKeyEntry.html @@ -0,0 +1,4 @@ +
+ Enter your Datadog API key, which can be found + here. +
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html new file mode 100644 index 000000000..c8d6728f0 --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html @@ -0,0 +1,4 @@ +
+ Enter your Datadog application key, which can be found + here. +
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApiKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApiKeyEntry.html new file mode 100644 index 000000000..417a9dec3 --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApiKeyEntry.html @@ -0,0 +1,6 @@ +
+ Enter your Datadog API key, which can be found + here. + This field is optional, use it only if you would like to store your API key with + Jenkins Credentials. +
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html new file mode 100644 index 000000000..bc9c0ae11 --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html @@ -0,0 +1,6 @@ +
+ Enter your Datadog application key, which can be found + here. + This field is an alternative to specifying the application key directly (field above), use it only if you would like to store your application key with + Jenkins Credentials. +
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly new file mode 100644 index 000000000..0708dd490 --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html new file mode 100644 index 000000000..c09a02fd6 --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html @@ -0,0 +1,5 @@ +
+ Enable Datadog Test Visibility for this job. + Any Maven or Gradle build that this job executes will be traced. + This requires configuring Datadog Plugin connectivity. +
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/config.jelly new file mode 100644 index 000000000..ae3dd4e3b --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/config.jelly @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/help-serviceName.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/help-serviceName.html new file mode 100644 index 000000000..1ecb4660a --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/help-serviceName.html @@ -0,0 +1,4 @@ +
+ The name of the service or library being tested. + This value is used for populating test.service tag in Datadog. +
From 3a4643b279298d5e47a643ac614052e7139d3ce7 Mon Sep 17 00:00:00 2001 From: "ci.logs-backend" Date: Thu, 10 Aug 2023 13:31:36 +0200 Subject: [PATCH 02/14] Add possibility to specify additional tracer settings --- .../tracer/DatadogTracerConfigurator.java | 24 ++++--- .../tracer/DatadogTracerJobProperty.java | 65 ++++++++++++------- .../tracer/DatadogTracerJobPropertyInfo.java | 43 ------------ .../DatadogTracerJobProperty/config.jelly | 28 +++++++- .../help-additionalVariables.html | 4 ++ .../help-serviceName.html | 0 .../DatadogTracerJobPropertyInfo/config.jelly | 8 --- 7 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo.java create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html rename src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/{DatadogTracerJobPropertyInfo => DatadogTracerJobProperty}/help-serviceName.html (100%) delete mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/config.jelly diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java index 9791c4e87..47265443d 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java @@ -15,6 +15,7 @@ import java.net.URL; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.logging.Level; @@ -40,8 +41,8 @@ public class DatadogTracerConfigurator { public Map configure(Run run, Node node, Map envs) { Job job = run.getParent(); - DatadogTracerJobProperty property = job.getProperty(DatadogTracerJobProperty.class); - if (property == null || !property.isOn()) { + DatadogTracerJobProperty tracerConfig = job.getProperty(DatadogTracerJobProperty.class); + if (tracerConfig == null || !tracerConfig.isOn()) { return Collections.emptyMap(); } @@ -51,16 +52,15 @@ public Map configure(Run run, Node node, Map variables = doConfigure(info, run, node, envs); + Map variables = doConfigure(tracerConfig, run, node, envs); run.addAction(new ConfigureTracerAction(node, variables)); return variables; } - private Map doConfigure(DatadogTracerJobPropertyInfo info, Run run, Node node, Map envs) { + private Map doConfigure(DatadogTracerJobProperty tracerConfig, Run run, Node node, Map envs) { try { FilePath tracerFile = downloadTracer(run, node); - return createEnvVariables(info, node, tracerFile, envs); + return createEnvVariables(tracerConfig, node, tracerFile, envs); } catch (Exception e) { LOGGER.log(Level.INFO, "Error while configuring Datadog Tracer for run " + run + " and node " + node, e); return Collections.emptyMap(); @@ -126,7 +126,7 @@ private static TopLevelItem getTopLevelItem(Run run) { } } - private static Map createEnvVariables(DatadogTracerJobPropertyInfo info, Node node, FilePath tracerFile, Map envs) { + private static Map createEnvVariables(DatadogTracerJobProperty tracerConfig, Node node, FilePath tracerFile, Map envs) { DatadogGlobalConfiguration datadogConfig = DatadogUtilities.getDatadogGlobalDescriptor(); if (datadogConfig == null) { LOGGER.log(Level.INFO, "Cannot set up tracer: Datadog config not found"); @@ -136,7 +136,7 @@ private static Map createEnvVariables(DatadogTracerJobPropertyIn Map variables = new HashMap<>(); variables.put("DD_CIVISIBILITY_ENABLED", "true"); variables.put("DD_ENV", "ci"); - variables.put("DD_SERVICE", info.getServiceName()); + variables.put("DD_SERVICE", tracerConfig.getServiceName()); String tracerAgent = "-javaagent:" + tracerFile.getRemote(); variables.put("MAVEN_OPTS", prepend(envs, "MAVEN_OPTS", tracerAgent)); @@ -163,8 +163,12 @@ private static Map createEnvVariables(DatadogTracerJobPropertyIn variables.put("JAVA_TOOL_OPTIONS", prepend(envs, "JAVA_TOOL_OPTIONS", proxyConfiguration)); } - // FIXME nikita: consider adding fields for additional tracer properties to config section (DatadogTracerJobPropertyInfo) - // see http://localhost:8080/computer/(built-in)/configure - Node Properties - Environment Variable for an example of dynamic list + List additionalVariables = tracerConfig.getAdditionalVariables(); + if (additionalVariables != null) { + for (DatadogTracerJobProperty.DatadogTracerEnvironmentProperty additionalVariable : additionalVariables) { + variables.put(additionalVariable.getName(), additionalVariable.getValue()); + } + } // FIXME nikita: see if I can maybe group Tagging and Test Visibility settings in one Datadog section diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java index 5a306ef66..5aa877de5 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java @@ -1,48 +1,41 @@ package org.datadog.jenkins.plugins.datadog.tracer; +import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import hudson.model.Job; import hudson.model.JobProperty; import hudson.model.JobPropertyDescriptor; +import java.io.Serializable; +import java.util.List; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.StaplerRequest; public class DatadogTracerJobProperty> extends JobProperty { private static final String DISPLAY_NAME = "Enable Datadog Test Visibility"; - @NonNull - private DatadogTracerJobPropertyInfo info = new DatadogTracerJobPropertyInfo(); + private final boolean on; + private final String serviceName; + private final List additionalVariables; - private boolean on; - - public DatadogTracerJobProperty() {} - - @DataBoundConstructor - public DatadogTracerJobProperty(DatadogTracerJobPropertyInfo info) { - this.info = info; - } - - @DataBoundSetter - public void setOn(boolean on) { + public DatadogTracerJobProperty(boolean on, String serviceName, List additionalVariables) { this.on = on; + this.serviceName = serviceName; + this.additionalVariables = additionalVariables; } public boolean isOn() { return on; } - @DataBoundSetter - public void setInfo(DatadogTracerJobPropertyInfo info) { - this.info = info; + public String getServiceName() { + return serviceName; } - @NonNull - public DatadogTracerJobPropertyInfo getInfo() { - return info; + public List getAdditionalVariables() { + return additionalVariables; } @Extension @@ -58,11 +51,35 @@ public boolean isApplicable(Class jobType) { } @Override - public DatadogTracerJobProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException { - if (formData.optBoolean("on")) { - return (DatadogTracerJobProperty) super.newInstance(req, formData); + public DatadogTracerJobProperty newInstance(StaplerRequest req, JSONObject formData) { + if (!formData.optBoolean("on")) { + return null; } - return null; + + String serviceName = formData.getString("serviceName"); + List additionalVariables = req.bindJSONToList(DatadogTracerEnvironmentProperty.class, formData.get("additionalVariable")); + return new DatadogTracerJobProperty(true, serviceName, additionalVariables); + } + } + + public static class DatadogTracerEnvironmentProperty implements Serializable { + private final String name; + private final String value; + + @DataBoundConstructor + public DatadogTracerEnvironmentProperty(String name, String value) { + this.name = name; + this.value = value; + } + + @CheckForNull + public String getName() { + return name; + } + + @NonNull + public String getValue() { + return value; } } } diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo.java deleted file mode 100644 index 2cb06674f..000000000 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.datadog.jenkins.plugins.datadog.tracer; - -import hudson.Extension; -import hudson.model.Describable; -import hudson.model.Descriptor; -import jenkins.model.Jenkins; -import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.DataBoundSetter; - -public class DatadogTracerJobPropertyInfo implements Describable { - - private String serviceName; - - public DatadogTracerJobPropertyInfo() {} - - @DataBoundConstructor - public DatadogTracerJobPropertyInfo(String serviceName) { - this.serviceName = serviceName; - } - - @DataBoundSetter - public DatadogTracerJobPropertyInfo setServiceName(String serviceName) { - this.serviceName = serviceName; - return this; - } - - public String getServiceName() { - return serviceName; - } - - @Override - public Descriptor getDescriptor() { - return Jenkins.get().getDescriptorByType(DatadogTracerJobPropertyInfoDescriptor.class); - } - - @Extension - public static class DatadogTracerJobPropertyInfoDescriptor extends Descriptor { - @Override - public String getDisplayName() { - return "DatadogTracerJobPropertyInfo"; - } - } -} diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly index 0708dd490..ce1653578 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly @@ -7,7 +7,33 @@ checked="${instance != null and instance.on}" inline="true"> - + + + + + + + +
+ + + + + + + + + + +
+ +
+ + +
+ + diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html new file mode 100644 index 000000000..4819c000e --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html @@ -0,0 +1,4 @@ +
+ Additional environment variables to configure tracer behavior. + These are optional, use only if you want to change defaults. +
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/help-serviceName.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-serviceName.html similarity index 100% rename from src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/help-serviceName.html rename to src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-serviceName.html diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/config.jelly deleted file mode 100644 index ae3dd4e3b..000000000 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobPropertyInfo/config.jelly +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - From 7753611d3b331d86de9503017faa03f6bafb4691 Mon Sep 17 00:00:00 2001 From: "ci.logs-backend" Date: Thu, 10 Aug 2023 17:09:00 +0200 Subject: [PATCH 03/14] Cosmetic improvements --- .../tracer/DatadogTracerConfigurator.java | 87 ++++++++++++------- .../tracer/DatadogTracerJobProperty.java | 21 +++-- .../DatadogTracerJobProperty/config.jelly | 2 +- .../help-additionalVariables.html | 9 +- 4 files changed, 77 insertions(+), 42 deletions(-) diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java index 47265443d..3406b15e8 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java @@ -15,7 +15,6 @@ import java.net.URL; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.logging.Level; @@ -32,6 +31,7 @@ public class DatadogTracerConfigurator { private static final String TRACER_DISTRIBUTION_URL = "https://dtdg.co/latest-java-tracer"; private static final String TRACER_FILE_NAME = "dd-java-agent.jar"; + private static final String TRACER_IGNORE_JENKINS_PROXY_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_IGNORE_JENKINS_PROXY"; private static final String TRACER_JAR_CACHE_TTL_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_JAR_CACHE_TTL_MINUTES"; private static final int DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES = 60 * 12; @@ -52,22 +52,32 @@ public Map configure(Run run, Node node, Map variables = doConfigure(tracerConfig, run, node, envs); + DatadogGlobalConfiguration datadogConfig = DatadogUtilities.getDatadogGlobalDescriptor(); + if (datadogConfig == null) { + LOGGER.log(Level.INFO, "Cannot set up tracer: Datadog config not found"); + return Collections.emptyMap(); + } + + Map variables = doConfigure(datadogConfig, tracerConfig, run, node, envs); run.addAction(new ConfigureTracerAction(node, variables)); return variables; } - private Map doConfigure(DatadogTracerJobProperty tracerConfig, Run run, Node node, Map envs) { + private Map doConfigure(DatadogGlobalConfiguration datadogConfig, + DatadogTracerJobProperty tracerConfig, + Run run, + Node node, + Map envs) { try { - FilePath tracerFile = downloadTracer(run, node); - return createEnvVariables(tracerConfig, node, tracerFile, envs); + FilePath tracerFile = downloadTracer(tracerConfig, run, node); + return createEnvVariables(datadogConfig, tracerConfig, node, tracerFile, envs); } catch (Exception e) { LOGGER.log(Level.INFO, "Error while configuring Datadog Tracer for run " + run + " and node " + node, e); return Collections.emptyMap(); } } - private FilePath downloadTracer(Run run, Node node) throws Exception { + private FilePath downloadTracer(DatadogTracerJobProperty tracerConfig, Run run, Node node) throws Exception { TopLevelItem topLevelItem = getTopLevelItem(run); FilePath workspacePath = node.getWorkspaceFor(topLevelItem); if (workspacePath == null) { @@ -79,7 +89,7 @@ private FilePath downloadTracer(Run run, Node node) throws Exception { FilePath datadogTracerFile = datadogFolder.child(TRACER_FILE_NAME); long minutesSinceModification = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - datadogTracerFile.lastModified()); - if (minutesSinceModification < getTracerJarCacheTtlMinutes()) { + if (minutesSinceModification < getTracerJarCacheTtlMinutes(tracerConfig)) { // downloaded tracer is fresh enough return datadogTracerFile.absolutize(); } @@ -95,18 +105,6 @@ private FilePath downloadTracer(Run run, Node node) throws Exception { return datadogTracerFile.absolutize(); } - private int getTracerJarCacheTtlMinutes() { - String envVariable = System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); - if (envVariable != null) { - try { - return Integer.parseInt(envVariable); - } catch (Exception e) { - // ignored - } - } - return DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES; - } - private static TopLevelItem getTopLevelItem(Run run) { if (run instanceof AbstractBuild) { AbstractBuild build = (AbstractBuild) run; @@ -126,13 +124,36 @@ private static TopLevelItem getTopLevelItem(Run run) { } } - private static Map createEnvVariables(DatadogTracerJobProperty tracerConfig, Node node, FilePath tracerFile, Map envs) { - DatadogGlobalConfiguration datadogConfig = DatadogUtilities.getDatadogGlobalDescriptor(); - if (datadogConfig == null) { - LOGGER.log(Level.INFO, "Cannot set up tracer: Datadog config not found"); - return Collections.emptyMap(); + private int getTracerJarCacheTtlMinutes(DatadogTracerJobProperty tracerConfig) { + Map additionalVariables = tracerConfig.getAdditionalVariables(); + if (additionalVariables != null) { + String envVariable = additionalVariables.get(TRACER_JAR_CACHE_TTL_ENV_VAR); + if (envVariable != null) { + try { + return Integer.parseInt(envVariable); + } catch (Exception e) { + // ignored + } + } + } + + String envVariable = System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); + if (envVariable != null) { + try { + return Integer.parseInt(envVariable); + } catch (Exception e) { + // ignored + } } + return DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES; + } + + private static Map createEnvVariables(DatadogGlobalConfiguration datadogConfig, + DatadogTracerJobProperty tracerConfig, + Node node, + FilePath tracerFile, + Map envs) { Map variables = new HashMap<>(); variables.put("DD_CIVISIBILITY_ENABLED", "true"); variables.put("DD_ENV", "ci"); @@ -158,20 +179,16 @@ private static Map createEnvVariables(DatadogTracerJobProperty additionalVariables = tracerConfig.getAdditionalVariables(); + Map additionalVariables = tracerConfig.getAdditionalVariables(); if (additionalVariables != null) { - for (DatadogTracerJobProperty.DatadogTracerEnvironmentProperty additionalVariable : additionalVariables) { - variables.put(additionalVariable.getName(), additionalVariable.getValue()); - } + variables.putAll(additionalVariables); } - // FIXME nikita: see if I can maybe group Tagging and Test Visibility settings in one Datadog section - return variables; } @@ -206,7 +223,7 @@ private static String getAgentPort(Integer traceCollectionPort) { } } - private static String getProxyConfiguration(Node node) { + private static String getProxyConfiguration(DatadogTracerJobProperty tracerConfig, Node node) { if (!(node instanceof Jenkins)) { // only apply Jenkins proxy settings if tracer will be run on master node return null; @@ -221,6 +238,11 @@ private static String getProxyConfiguration(Node node) { return null; } + Map additionalVariables = tracerConfig.getAdditionalVariables(); + if (Boolean.parseBoolean(additionalVariables.get(TRACER_IGNORE_JENKINS_PROXY_ENV_VAR))) { + return null; + } + String proxyHost = jenkinsProxyConfiguration.getName(); int proxyPort = jenkinsProxyConfiguration.getPort(); String noProxyHost = jenkinsProxyConfiguration.getNoProxyHost(); @@ -255,5 +277,4 @@ private ConfigureTracerAction(Node node, Map variables) { this.variables = variables; } } - } diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java index 5aa877de5..9d04f53f0 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java @@ -7,7 +7,9 @@ import hudson.model.JobProperty; import hudson.model.JobPropertyDescriptor; import java.io.Serializable; +import java.util.HashMap; import java.util.List; +import java.util.Map; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; @@ -18,9 +20,9 @@ public class DatadogTracerJobProperty> extends JobProperty additionalVariables; + private final Map additionalVariables; - public DatadogTracerJobProperty(boolean on, String serviceName, List additionalVariables) { + public DatadogTracerJobProperty(boolean on, String serviceName, Map additionalVariables) { this.on = on; this.serviceName = serviceName; this.additionalVariables = additionalVariables; @@ -34,12 +36,13 @@ public String getServiceName() { return serviceName; } - public List getAdditionalVariables() { + public Map getAdditionalVariables() { return additionalVariables; } @Extension public static final class DatadogTracerJobPropertyDescriptor extends JobPropertyDescriptor { + @NonNull @Override public String getDisplayName() { return DISPLAY_NAME; @@ -51,14 +54,20 @@ public boolean isApplicable(Class jobType) { } @Override - public DatadogTracerJobProperty newInstance(StaplerRequest req, JSONObject formData) { + public DatadogTracerJobProperty newInstance(StaplerRequest req, JSONObject formData) { if (!formData.optBoolean("on")) { return null; } String serviceName = formData.getString("serviceName"); - List additionalVariables = req.bindJSONToList(DatadogTracerEnvironmentProperty.class, formData.get("additionalVariable")); - return new DatadogTracerJobProperty(true, serviceName, additionalVariables); + + Map additionalVariables = new HashMap<>(); + List additionalVariablesList = req.bindJSONToList(DatadogTracerEnvironmentProperty.class, formData.get("additionalVariable")); + for (DatadogTracerEnvironmentProperty additionalVariable : additionalVariablesList) { + additionalVariables.put(additionalVariable.getName(), additionalVariable.getValue()); + } + + return new DatadogTracerJobProperty<>(true, serviceName, additionalVariables); } } diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly index ce1653578..5dddf468f 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly @@ -18,7 +18,7 @@
- + diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html index 4819c000e..9411ba275 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html @@ -1,4 +1,9 @@
- Additional environment variables to configure tracer behavior. - These are optional, use only if you want to change defaults. +

+ Additional environment variables to fine-tune the tracer behavior. + See Datadog docs for more details. +

+

+ These are optional, use only if you want to change defaults. +

From 648b4c4edced59c17d7a0d8064a8aef1f404496a Mon Sep 17 00:00:00 2001 From: "ci.logs-backend" Date: Fri, 11 Aug 2023 13:40:30 +0200 Subject: [PATCH 04/14] Update plugin documentation --- README.md | 10 ++++++++++ .../tracer/DatadogTracerJobProperty/config.jelly | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3886487d5..60fd10216 100644 --- a/README.md +++ b/README.md @@ -226,6 +226,16 @@ From a job specific configuration page: | Custom tags | Set from a `File` in the job workspace (not compatible with pipeline jobs) or as text `Properties` directly from the configuration page. If set, this overrides the `Global Job Tags` configuration. | | Send source control management events | Submits the `Source Control Management Events Type` of events and metrics (enabled by default). | +### Test Visibility Configuration + +The plugin can automatically configure Datadog Test Visibility for a job or a pipeline. + +Before enabling Test Visibility, be sure to properly configure the plugin to submit data to Datadog. + +To enable Test Visibility, go to the `Configure` page of the job or pipeline whose tests need to be traced, tick `Enable Datadog Test Visibility` checkbox in the `General` section and save your changes. + +Once Test Visibility is enabled, any Maven or Gradle build that the job or pipeline executes will be traced. + ## Data collected This plugin is collecting the following [events](#events), [metrics](#metrics), and [service checks](#service-checks): diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly index 5dddf468f..b21f3d7f8 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly @@ -8,7 +8,7 @@ inline="true"> - + Date: Wed, 23 Aug 2023 13:16:44 +0200 Subject: [PATCH 05/14] Add possibility to configure tracer for JS and Python --- .../tracer/DatadogTracerConfigurator.java | 167 +++----------- .../tracer/DatadogTracerJobProperty.java | 22 +- .../datadog/tracer/JavaConfigurator.java | 143 ++++++++++++ .../tracer/JavascriptConfigurator.java | 72 ++++++ .../plugins/datadog/tracer/PropertyUtils.java | 10 + .../datadog/tracer/PythonConfigurator.java | 93 ++++++++ .../datadog/tracer/TracerConfigurator.java | 12 + .../datadog/tracer/TracerLanguage.java | 18 ++ .../datadog/util/ShellCommandExecutor.java | 211 ++++++++++++++++++ .../DatadogTracerJobProperty/config.jelly | 4 + .../help-additionalVariables.html | 2 +- .../help-languages.html | 37 +++ .../DatadogTracerJobProperty/help-on.html | 1 - 13 files changed, 652 insertions(+), 140 deletions(-) create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavascriptConfigurator.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PropertyUtils.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PythonConfigurator.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/TracerConfigurator.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/TracerLanguage.java create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/util/ShellCommandExecutor.java create mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-languages.html diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java index 3406b15e8..37e671ea3 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java @@ -13,32 +13,32 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.util.Collection; import java.util.Collections; +import java.util.EnumMap; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; -import jenkins.model.Jenkins; import org.datadog.jenkins.plugins.datadog.DatadogClient; import org.datadog.jenkins.plugins.datadog.DatadogGlobalConfiguration; import org.datadog.jenkins.plugins.datadog.DatadogUtilities; -import org.datadog.jenkins.plugins.datadog.clients.HttpClient; public class DatadogTracerConfigurator { private static final Logger LOGGER = Logger.getLogger(DatadogTracerConfigurator.class.getName()); - private static final String TRACER_DISTRIBUTION_URL = "https://dtdg.co/latest-java-tracer"; - private static final String TRACER_FILE_NAME = "dd-java-agent.jar"; - private static final String TRACER_IGNORE_JENKINS_PROXY_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_IGNORE_JENKINS_PROXY"; - private static final String TRACER_JAR_CACHE_TTL_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_JAR_CACHE_TTL_MINUTES"; - private static final int DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES = 60 * 12; - - private final HttpClient httpClient = new HttpClient(60_000); + private final Map configurators; public static final DatadogTracerConfigurator INSTANCE = new DatadogTracerConfigurator(); + public DatadogTracerConfigurator() { + configurators = new EnumMap<>(TracerLanguage.class); + configurators.put(TracerLanguage.JAVA, new JavaConfigurator()); + configurators.put(TracerLanguage.JAVASCRIPT, new JavascriptConfigurator()); + configurators.put(TracerLanguage.PYTHON, new PythonConfigurator()); + } + public Map configure(Run run, Node node, Map envs) { Job job = run.getParent(); DatadogTracerJobProperty tracerConfig = job.getProperty(DatadogTracerJobProperty.class); @@ -46,8 +46,9 @@ public Map configure(Run run, Node node, Map languages = tracerConfig.getLanguages(); for (ConfigureTracerAction action : run.getActions(ConfigureTracerAction.class)) { - if (action.node == node) { + if (action.node == node && languages.equals(action.languages)) { return action.variables; } } @@ -58,51 +59,30 @@ public Map configure(Run run, Node node, Map variables = doConfigure(datadogConfig, tracerConfig, run, node, envs); - run.addAction(new ConfigureTracerAction(node, variables)); - return variables; - } - - private Map doConfigure(DatadogGlobalConfiguration datadogConfig, - DatadogTracerJobProperty tracerConfig, - Run run, - Node node, - Map envs) { - try { - FilePath tracerFile = downloadTracer(tracerConfig, run, node); - return createEnvVariables(datadogConfig, tracerConfig, node, tracerFile, envs); - } catch (Exception e) { - LOGGER.log(Level.INFO, "Error while configuring Datadog Tracer for run " + run + " and node " + node, e); - return Collections.emptyMap(); - } - } - - private FilePath downloadTracer(DatadogTracerJobProperty tracerConfig, Run run, Node node) throws Exception { TopLevelItem topLevelItem = getTopLevelItem(run); FilePath workspacePath = node.getWorkspaceFor(topLevelItem); if (workspacePath == null) { throw new IllegalStateException("Cannot find workspace path for " + topLevelItem + " on " + node); } - FilePath datadogFolder = workspacePath.child(".datadog"); - datadogFolder.mkdirs(); - - FilePath datadogTracerFile = datadogFolder.child(TRACER_FILE_NAME); - long minutesSinceModification = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - datadogTracerFile.lastModified()); - if (minutesSinceModification < getTracerJarCacheTtlMinutes(tracerConfig)) { - // downloaded tracer is fresh enough - return datadogTracerFile.absolutize(); - } + Map variables = new HashMap<>(getCommonEnvVariables(datadogConfig, tracerConfig)); + for (TracerLanguage language : languages) { + TracerConfigurator tracerConfigurator = configurators.get(language); + if (tracerConfigurator == null) { + LOGGER.log(Level.INFO, "Cannot find tracer configurator for " + language); + continue; + } - httpClient.getBinary(TRACER_DISTRIBUTION_URL, Collections.emptyMap(), is -> { try { - datadogTracerFile.copyFrom(is); + Map languageVariables = tracerConfigurator.configure(tracerConfig, node, workspacePath, envs); + variables.putAll(languageVariables); } catch (Exception e) { - throw new RuntimeException(e); + LOGGER.log(Level.INFO, "Error while configuring " + language + " Datadog Tracer for run " + run + " and node " + node, e); + return Collections.emptyMap(); } - }); - - return datadogTracerFile.absolutize(); + } + run.addAction(new ConfigureTracerAction(node, languages, variables)); + return variables; } private static TopLevelItem getTopLevelItem(Run run) { @@ -124,45 +104,13 @@ private static TopLevelItem getTopLevelItem(Run run) { } } - private int getTracerJarCacheTtlMinutes(DatadogTracerJobProperty tracerConfig) { - Map additionalVariables = tracerConfig.getAdditionalVariables(); - if (additionalVariables != null) { - String envVariable = additionalVariables.get(TRACER_JAR_CACHE_TTL_ENV_VAR); - if (envVariable != null) { - try { - return Integer.parseInt(envVariable); - } catch (Exception e) { - // ignored - } - } - } - - String envVariable = System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); - if (envVariable != null) { - try { - return Integer.parseInt(envVariable); - } catch (Exception e) { - // ignored - } - } - - return DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES; - } - - private static Map createEnvVariables(DatadogGlobalConfiguration datadogConfig, - DatadogTracerJobProperty tracerConfig, - Node node, - FilePath tracerFile, - Map envs) { + private static Map getCommonEnvVariables(DatadogGlobalConfiguration datadogConfig, + DatadogTracerJobProperty tracerConfig) { Map variables = new HashMap<>(); variables.put("DD_CIVISIBILITY_ENABLED", "true"); variables.put("DD_ENV", "ci"); variables.put("DD_SERVICE", tracerConfig.getServiceName()); - String tracerAgent = "-javaagent:" + tracerFile.getRemote(); - variables.put("MAVEN_OPTS", prepend(envs, "MAVEN_OPTS", tracerAgent)); - variables.put("GRADLE_OPTS", prepend(envs, "GRADLE_OPTS", "-Dorg.gradle.jvmargs=" + tracerAgent)); - DatadogClient.ClientType clientType = DatadogClient.ClientType.valueOf(datadogConfig.getReportWith()); switch (clientType) { case HTTP: @@ -179,11 +127,6 @@ private static Map createEnvVariables(DatadogGlobalConfiguration throw new IllegalArgumentException("Unexpected client type: " + clientType); } - String proxyConfiguration = getProxyConfiguration(tracerConfig, node); - if (proxyConfiguration != null) { - variables.put("JAVA_TOOL_OPTIONS", prepend(envs, "JAVA_TOOL_OPTIONS", proxyConfiguration)); - } - Map additionalVariables = tracerConfig.getAdditionalVariables(); if (additionalVariables != null) { variables.putAll(additionalVariables); @@ -192,11 +135,6 @@ private static Map createEnvVariables(DatadogGlobalConfiguration return variables; } - private static String prepend(Map envs, String propertyName, String propertyValue) { - String existingPropertyValue = envs.get(propertyName); - return propertyValue + (existingPropertyValue != null ? " " + existingPropertyValue : ""); - } - private static String getSite(String apiUrl) { // what users configure for Pipelines looks like "https://api.datadoghq.com/api/" // while what the tracer needs "datadoghq.com" @@ -223,57 +161,14 @@ private static String getAgentPort(Integer traceCollectionPort) { } } - private static String getProxyConfiguration(DatadogTracerJobProperty tracerConfig, Node node) { - if (!(node instanceof Jenkins)) { - // only apply Jenkins proxy settings if tracer will be run on master node - return null; - } - - Jenkins jenkins = Jenkins.getInstanceOrNull(); - if (jenkins == null) { - return null; - } - hudson.ProxyConfiguration jenkinsProxyConfiguration = jenkins.getProxy(); - if (jenkinsProxyConfiguration == null) { - return null; - } - - Map additionalVariables = tracerConfig.getAdditionalVariables(); - if (Boolean.parseBoolean(additionalVariables.get(TRACER_IGNORE_JENKINS_PROXY_ENV_VAR))) { - return null; - } - - String proxyHost = jenkinsProxyConfiguration.getName(); - int proxyPort = jenkinsProxyConfiguration.getPort(); - String noProxyHost = jenkinsProxyConfiguration.getNoProxyHost(); - String userName = jenkinsProxyConfiguration.getUserName(); - Secret password = jenkinsProxyConfiguration.getSecretPassword(); - - StringBuilder proxyOptions = new StringBuilder(); - if (proxyHost != null) { - proxyOptions.append("-Dhttp.proxyHost=").append(proxyHost); - } - if (proxyPort > 0) { - proxyOptions.append("-Dhttp.proxyPort=").append(proxyPort); - } - if (noProxyHost != null) { - proxyOptions.append("-Dhttp.nonProxyHosts=").append(noProxyHost); - } - if (userName != null) { - proxyOptions.append("-Dhttp.proxyUser=").append(userName); - } - if (password != null) { - proxyOptions.append("-Dhttp.proxyPassword=").append(Secret.toString(password)); - } - return proxyOptions.length() > 0 ? proxyOptions.toString() : null; - } - private static final class ConfigureTracerAction extends InvisibleAction { private final Node node; + private final Collection languages; private final Map variables; - private ConfigureTracerAction(Node node, Map variables) { + private ConfigureTracerAction(Node node, Collection languages, Map variables) { this.node = node; + this.languages = languages; this.variables = variables; } } diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java index 9d04f53f0..2cabf186e 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java @@ -7,9 +7,12 @@ import hudson.model.JobProperty; import hudson.model.JobPropertyDescriptor; import java.io.Serializable; +import java.util.Collection; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; @@ -20,11 +23,13 @@ public class DatadogTracerJobProperty> extends JobProperty languages; private final Map additionalVariables; - public DatadogTracerJobProperty(boolean on, String serviceName, Map additionalVariables) { + public DatadogTracerJobProperty(boolean on, String serviceName, Collection languages, Map additionalVariables) { this.on = on; this.serviceName = serviceName; + this.languages = languages; this.additionalVariables = additionalVariables; } @@ -36,6 +41,10 @@ public String getServiceName() { return serviceName; } + public Collection getLanguages() { + return languages; + } + public Map getAdditionalVariables() { return additionalVariables; } @@ -61,13 +70,22 @@ public DatadogTracerJobProperty newInstance(StaplerRequest req, JSONObject fo String serviceName = formData.getString("serviceName"); + Set languages = EnumSet.noneOf(TracerLanguage.class); + JSONObject languagesJson = (JSONObject) formData.get("languages"); + for (Map.Entry e : (Set>) languagesJson.entrySet()) { + TracerLanguage language = TracerLanguage.valueOf(e.getKey()); + if (e.getValue()) { + languages.add(language); + } + } + Map additionalVariables = new HashMap<>(); List additionalVariablesList = req.bindJSONToList(DatadogTracerEnvironmentProperty.class, formData.get("additionalVariable")); for (DatadogTracerEnvironmentProperty additionalVariable : additionalVariablesList) { additionalVariables.put(additionalVariable.getName(), additionalVariable.getValue()); } - return new DatadogTracerJobProperty<>(true, serviceName, additionalVariables); + return new DatadogTracerJobProperty<>(true, serviceName, languages, additionalVariables); } } diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java new file mode 100644 index 000000000..2e8054337 --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java @@ -0,0 +1,143 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import hudson.FilePath; +import hudson.model.Node; +import hudson.util.Secret; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import jenkins.model.Jenkins; +import org.datadog.jenkins.plugins.datadog.clients.HttpClient; + +final class JavaConfigurator implements TracerConfigurator { + + private static final String TRACER_DISTRIBUTION_URL = "https://dtdg.co/latest-java-tracer"; + private static final String TRACER_FILE_NAME = "dd-java-agent.jar"; + private static final String TRACER_IGNORE_JENKINS_PROXY_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_IGNORE_JENKINS_PROXY"; + private static final String TRACER_JAR_CACHE_TTL_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_JAR_CACHE_TTL_MINUTES"; + private static final int DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES = 60 * 12; + + private final HttpClient httpClient = new HttpClient(60_000); + + @Override + public Map configure(DatadogTracerJobProperty tracerConfig, Node node, FilePath workspacePath, Map envs) throws Exception { + FilePath tracerFile = downloadTracer(tracerConfig, workspacePath); + return getEnvVariables(tracerConfig, node, tracerFile, envs); + } + + private FilePath downloadTracer(DatadogTracerJobProperty tracerConfig, FilePath workspacePath) throws Exception { + FilePath datadogFolder = workspacePath.child(".datadog"); + datadogFolder.mkdirs(); + + FilePath datadogTracerFile = datadogFolder.child(TRACER_FILE_NAME); + long minutesSinceModification = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - datadogTracerFile.lastModified()); + if (minutesSinceModification < getTracerJarCacheTtlMinutes(tracerConfig)) { + // downloaded tracer is fresh enough + return datadogTracerFile.absolutize(); + } + + httpClient.getBinary(TRACER_DISTRIBUTION_URL, Collections.emptyMap(), is -> { + try { + datadogTracerFile.copyFrom(is); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); + + return datadogTracerFile.absolutize(); + } + + private int getTracerJarCacheTtlMinutes(DatadogTracerJobProperty tracerConfig) { + Map additionalVariables = tracerConfig.getAdditionalVariables(); + if (additionalVariables != null) { + String envVariable = additionalVariables.get(TRACER_JAR_CACHE_TTL_ENV_VAR); + if (envVariable != null) { + try { + return Integer.parseInt(envVariable); + } catch (Exception e) { + // ignored + } + } + } + + String envVariable = System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); + if (envVariable != null) { + try { + return Integer.parseInt(envVariable); + } catch (Exception e) { + // ignored + } + } + + return DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES; + } + + private static Map getEnvVariables(DatadogTracerJobProperty tracerConfig, + Node node, + FilePath tracerFile, + Map envs) { + Map variables = new HashMap<>(); + + String tracerAgent = "-javaagent:" + tracerFile.getRemote(); + variables.put("MAVEN_OPTS", PropertyUtils.prepend(envs, "MAVEN_OPTS", tracerAgent)); + variables.put("GRADLE_OPTS", PropertyUtils.prepend(envs, "GRADLE_OPTS", "-Dorg.gradle.jvmargs=" + tracerAgent)); + + String proxyConfiguration = getProxyConfiguration(tracerConfig, node); + if (proxyConfiguration != null) { + variables.put("JAVA_TOOL_OPTIONS", PropertyUtils.prepend(envs, "JAVA_TOOL_OPTIONS", proxyConfiguration)); + } + + Map additionalVariables = tracerConfig.getAdditionalVariables(); + if (additionalVariables != null) { + variables.putAll(additionalVariables); + } + + return variables; + } + + private static String getProxyConfiguration(DatadogTracerJobProperty tracerConfig, Node node) { + if (!(node instanceof Jenkins)) { + // only apply Jenkins proxy settings if tracer will be run on master node + return null; + } + + Jenkins jenkins = Jenkins.getInstanceOrNull(); + if (jenkins == null) { + return null; + } + hudson.ProxyConfiguration jenkinsProxyConfiguration = jenkins.getProxy(); + if (jenkinsProxyConfiguration == null) { + return null; + } + + Map additionalVariables = tracerConfig.getAdditionalVariables(); + if (Boolean.parseBoolean(additionalVariables.get(TRACER_IGNORE_JENKINS_PROXY_ENV_VAR))) { + return null; + } + + String proxyHost = jenkinsProxyConfiguration.getName(); + int proxyPort = jenkinsProxyConfiguration.getPort(); + String noProxyHost = jenkinsProxyConfiguration.getNoProxyHost(); + String userName = jenkinsProxyConfiguration.getUserName(); + Secret password = jenkinsProxyConfiguration.getSecretPassword(); + + StringBuilder proxyOptions = new StringBuilder(); + if (proxyHost != null) { + proxyOptions.append("-Dhttp.proxyHost=").append(proxyHost); + } + if (proxyPort > 0) { + proxyOptions.append("-Dhttp.proxyPort=").append(proxyPort); + } + if (noProxyHost != null) { + proxyOptions.append("-Dhttp.nonProxyHosts=").append(noProxyHost); + } + if (userName != null) { + proxyOptions.append("-Dhttp.proxyUser=").append(userName); + } + if (password != null) { + proxyOptions.append("-Dhttp.proxyPassword=").append(Secret.toString(password)); + } + return proxyOptions.length() > 0 ? proxyOptions.toString() : null; + } +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavascriptConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavascriptConfigurator.java new file mode 100644 index 000000000..81faaf1df --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavascriptConfigurator.java @@ -0,0 +1,72 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import hudson.FilePath; +import hudson.model.Node; +import hudson.remoting.VirtualChannel; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; +import jenkins.MasterToSlaveFileCallable; +import org.datadog.jenkins.plugins.datadog.util.ShellCommandExecutor; + +final class JavascriptConfigurator implements TracerConfigurator { + + private static final Logger LOGGER = Logger.getLogger(JavascriptConfigurator.class.getName()); + + @Override + public Map configure(DatadogTracerJobProperty tracerConfig, Node node, FilePath workspacePath, Map envs) throws Exception { + try { + String nodeVersion = workspacePath.act(new GetNpmVersion()); + LOGGER.log(Level.FINE, "Got npm version " + nodeVersion + " from " + workspacePath + " on " + node); + + String installTracerOutput = workspacePath.act(new InstallTracer()); + LOGGER.log(Level.FINE, "Trace installed in " + workspacePath + " on " + node + "; output: " + installTracerOutput); + + Path absoluteWorkspacePath = Paths.get(workspacePath.absolutize().getRemote()); + Path tracerPath = absoluteWorkspacePath.resolve("node_modules/dd-trace"); + + Map variables = new HashMap<>(); + variables.put("DD_TRACE_PATH", tracerPath.toString()); + variables.put("NODE_OPTIONS", PropertyUtils.prepend(envs, "NODE_OPTIONS", "-r ./example.js -r $DD_TRACE_PATH/ci/init")); + return variables; + + } catch (IOException e) { + LOGGER.log(Level.INFO, "Exception while trying to get node version from " + workspacePath + " on " + node + "; assuming node is not installed", e); + return Collections.emptyMap(); + } + } + + private static final class GetNpmVersion extends MasterToSlaveFileCallable { + @Override + public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { + try { + ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 30_000); + return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "npm", "-v"); + } catch (IOException | InterruptedException e) { + throw e; + } catch (Exception e) { + throw new IOException(e); + } + } + } + + private static final class InstallTracer extends MasterToSlaveFileCallable { + @Override + public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { + try { + ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 300_000); + return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "npm", "install", "dd-trace"); + } catch (IOException | InterruptedException e) { + throw e; + } catch (Exception e) { + throw new IOException(e); + } + } + } +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PropertyUtils.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PropertyUtils.java new file mode 100644 index 000000000..3ff559503 --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PropertyUtils.java @@ -0,0 +1,10 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import java.util.Map; + +public class PropertyUtils { + public static String prepend(Map envs, String propertyName, String propertyValue) { + String existingPropertyValue = envs.get(propertyName); + return propertyValue + (existingPropertyValue != null ? " " + existingPropertyValue : ""); + } +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PythonConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PythonConfigurator.java new file mode 100644 index 000000000..527213ef4 --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PythonConfigurator.java @@ -0,0 +1,93 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import hudson.FilePath; +import hudson.model.Node; +import hudson.remoting.VirtualChannel; +import java.io.File; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; +import jenkins.MasterToSlaveFileCallable; +import org.datadog.jenkins.plugins.datadog.util.ShellCommandExecutor; + +final class PythonConfigurator implements TracerConfigurator { + + private static final Logger LOGGER = Logger.getLogger(PythonConfigurator.class.getName()); + + @Override + public Map configure(DatadogTracerJobProperty tracerConfig, Node node, FilePath workspacePath, Map envs) throws Exception { + try { + String pipVersion = workspacePath.act(new GetPipVersion()); + LOGGER.log(Level.FINE, "Got pip version " + pipVersion + " from " + workspacePath + " on " + node); + + String installTracerOutput = workspacePath.act(new InstallTracer()); + LOGGER.log(Level.FINE, "Trace installed in " + workspacePath + " on " + node + "; output: " + installTracerOutput); + + String tracerLocation = getTracerLocation(workspacePath); + + Map variables = new HashMap<>(); + variables.put("PYTEST_ADDOPTS", PropertyUtils.prepend(envs, "PYTEST_ADDOPTS", "--ddtrace")); + variables.put("PYTHONPATH", PropertyUtils.prepend(envs, "PYTHONPATH", tracerLocation + ":")); + return variables; + + } catch (IOException e) { + LOGGER.log(Level.INFO, "Exception while trying to get node version from " + workspacePath + " on " + node + "; assuming node is not installed", e); + return Collections.emptyMap(); + } + } + + private static String getTracerLocation(FilePath workspacePath) throws IOException, InterruptedException { + String getTracerLocationOutput = workspacePath.act(new GetTracerLocation()); + for (String line : getTracerLocationOutput.split("\n")) { + if (line.contains("Location")) { + return line.substring(line.indexOf(':') + 2); + } + } + throw new IllegalStateException("Could not determine tracer location in " + workspacePath + "; command output is: " + getTracerLocationOutput); + } + + private static final class GetPipVersion extends MasterToSlaveFileCallable { + @Override + public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { + try { + ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 30_000); + return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "pip", "-V"); + } catch (IOException | InterruptedException e) { + throw e; + } catch (Exception e) { + throw new IOException(e); + } + } + } + + private static final class InstallTracer extends MasterToSlaveFileCallable { + @Override + public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { + try { + ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 300_000); + return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "pip", "install", "-U", "ddtrace"); + } catch (IOException | InterruptedException e) { + throw e; + } catch (Exception e) { + throw new IOException(e); + } + } + } + + private static final class GetTracerLocation extends MasterToSlaveFileCallable { + @Override + public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { + try { + ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 300_000); + return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "pip", "show", "ddtrace"); + } catch (IOException | InterruptedException e) { + throw e; + } catch (Exception e) { + throw new IOException(e); + } + } + } +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/TracerConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/TracerConfigurator.java new file mode 100644 index 000000000..a583e7f9a --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/TracerConfigurator.java @@ -0,0 +1,12 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import hudson.FilePath; +import hudson.model.Node; +import java.util.Map; + +interface TracerConfigurator { + Map configure(DatadogTracerJobProperty tracerConfig, + Node node, + FilePath workspacePath, + Map envs) throws Exception; +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/TracerLanguage.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/TracerLanguage.java new file mode 100644 index 000000000..1e91277e0 --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/TracerLanguage.java @@ -0,0 +1,18 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +public enum TracerLanguage { + JAVA("Java"), + JAVASCRIPT("JS"), + PYTHON("Python"); + + private final String label; + + TracerLanguage(String label) { + this.label = label; + } + + @Override + public String toString() { + return label; + } +} diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/util/ShellCommandExecutor.java b/src/main/java/org/datadog/jenkins/plugins/datadog/util/ShellCommandExecutor.java new file mode 100644 index 000000000..5238ec242 --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/util/ShellCommandExecutor.java @@ -0,0 +1,211 @@ +package org.datadog.jenkins.plugins.datadog.util; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +public class ShellCommandExecutor { + + private static final int NORMAL_TERMINATION_TIMEOUT_MILLIS = 3000; + + private final File executionFolder; + private final long timeoutMillis; + + public ShellCommandExecutor(File executionFolder, long timeoutMillis) { + this.executionFolder = executionFolder; + this.timeoutMillis = timeoutMillis; + } + + /** + * Executes given shell command and returns parsed output + * + * @param outputParser Parses that is used to process command output + * @param command Command to be executed + * @return Parsed command output + * @param Type of parsed command output + * @throws IOException If an error was encountered while writing command input or reading output + * @throws TimeoutException If timeout was reached while waiting for command to finish + * @throws InterruptedException If current thread was interrupted while waiting for command to + * finish + */ + public T executeCommand(OutputParser outputParser, String... command) + throws IOException, InterruptedException, TimeoutException { + return executeCommand(outputParser, null, false, command); + } + + /** + * Executes given shell command, supplies to it provided input, and returns parsed output + * + * @param outputParser Parses that is used to process command output + * @param input Bytes that are written to command's input stream + * @param command Command to be executed + * @return Parsed command output + * @param Type of parsed command output + * @throws IOException If an error was encountered while writing command input or reading output + * @throws TimeoutException If timeout was reached while waiting for command to finish + * @throws InterruptedException If current thread was interrupted while waiting for command to + * finish + */ + public T executeCommand(OutputParser outputParser, byte[] input, String... command) + throws IOException, InterruptedException, TimeoutException { + return executeCommand(outputParser, input, false, command); + } + + /** + * Executes given shell command and returns parsed error stream + * + * @param errorParser Parses that is used to process command's error stream + * @param command Command to be executed + * @return Parsed command output + * @param Type of parsed command output + * @throws IOException If an error was encountered while writing command input or reading output + * @throws TimeoutException If timeout was reached while waiting for command to finish + * @throws InterruptedException If current thread was interrupted while waiting for command to + * finish + */ + public T executeCommandReadingError(OutputParser errorParser, String... command) + throws IOException, InterruptedException, TimeoutException { + return executeCommand(errorParser, null, true, command); + } + + private T executeCommand( + OutputParser outputParser, byte[] input, boolean readFromError, String... command) + throws IOException, TimeoutException, InterruptedException { + ProcessBuilder processBuilder = new ProcessBuilder(command); + processBuilder.directory(executionFolder); + + Process p = processBuilder.start(); + + StreamConsumer inputStreamConsumer = new StreamConsumer(p.getInputStream()); + Thread inputStreamThread = new Thread(inputStreamConsumer, "input-stream-consumer-" + command[0]); + inputStreamThread.setDaemon(true); + inputStreamThread.start(); + + StreamConsumer errorStreamConsumer = new StreamConsumer(p.getErrorStream()); + Thread errorStreamThread = new Thread(errorStreamConsumer, "error-stream-consumer-" + command[0]); + errorStreamThread.setDaemon(true); + errorStreamThread.start(); + + if (input != null) { + p.getOutputStream().write(input); + p.getOutputStream().close(); + } + + try { + if (p.waitFor(timeoutMillis, TimeUnit.MILLISECONDS)) { + int exitValue = p.exitValue(); + if (exitValue != 0) { + throw new IOException( + "Command '" + + Arrays.toString(command) + + "' failed with exit code " + + exitValue + + ": " + + readLines(errorStreamConsumer.read(), Charset.defaultCharset())); + } + + if (outputParser != OutputParser.IGNORE) { + if (readFromError) { + errorStreamThread.join(NORMAL_TERMINATION_TIMEOUT_MILLIS); + return outputParser.parse(errorStreamConsumer.read()); + } else { + inputStreamThread.join(NORMAL_TERMINATION_TIMEOUT_MILLIS); + return outputParser.parse(inputStreamConsumer.read()); + } + } else { + return null; + } + + } else { + terminate(p); + throw new TimeoutException( + "Timeout while waiting for '" + + Arrays.toString(command) + + "'; " + + readLines(errorStreamConsumer.read(), Charset.defaultCharset())); + } + } catch (InterruptedException e) { + terminate(p); + throw e; + } + } + + private void terminate(Process p) throws InterruptedException { + p.destroy(); + try { + if (!p.waitFor(NORMAL_TERMINATION_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)) { + p.destroyForcibly(); + } + } catch (InterruptedException e) { + p.destroyForcibly(); + throw e; + } + } + + private static List readLines(InputStream input, Charset charset) throws IOException { + final InputStreamReader reader = new InputStreamReader(input, charset); + final BufferedReader bufReader = new BufferedReader(reader); + final List list = new ArrayList<>(); + String line; + while ((line = bufReader.readLine()) != null) { + list.add(line); + } + return list; + } + + private static final class StreamConsumer implements Runnable { + private final byte[] buffer = new byte[2048]; + private final ByteArrayOutputStream output = new ByteArrayOutputStream(); + private final InputStream input; + + private StreamConsumer(InputStream input) { + this.input = input; + } + + @Override + public void run() { + try { + int read; + while ((read = input.read(buffer)) != -1) { + output.write(buffer, 0, read); + } + } catch (Exception e) { + // ignore + } + } + + InputStream read() { + return new ByteArrayInputStream(output.toByteArray()); + } + } + + public interface OutputParser { + OutputParser IGNORE = is -> null; + + T parse(InputStream inputStream) throws IOException; + } + + public static final class ToStringOutputParser implements OutputParser { + @Override + public String parse(InputStream inputStream) throws IOException { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + byte[] buffer = new byte[4096]; + int count; + while ((count = inputStream.read(buffer)) != -1) { + output.write(buffer, 0, count); + } + return new String(output.toByteArray(), Charset.defaultCharset()); + } + } + +} diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly index b21f3d7f8..c124e4128 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly @@ -11,6 +11,10 @@ + + + + diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html index 9411ba275..70ac7ceb3 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-additionalVariables.html @@ -1,7 +1,7 @@

Additional environment variables to fine-tune the tracer behavior. - See Datadog docs for more details. + See Datadog docs for more details.

These are optional, use only if you want to change defaults. diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-languages.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-languages.html new file mode 100644 index 000000000..9d47dbc3f --- /dev/null +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-languages.html @@ -0,0 +1,37 @@ +

+

Automatic tracer injection comes with some language-specific caveats.

+ + Java +

+ Injection works for any JVM-based language (Java, Kotlin, Groovy, etc). + Any Maven or Gradle build that the job executes will be traced. +

+

+ MAVEN_OPTS and GRADLE_OPTS environment variables are used for injection. + If these variables are overridden inside the job (with their existing value being discarded rather than preserved), + the injection will not happen. +

+ + JS +

+ The plugin assumes that npm is available on the node that executes the job. +

+

+ NODE_OPTIONS environment variable is used for injection. + If this variable is overridden inside the job (with its existing value being discarded rather than preserved), + the injection will not happen. +

+ + Python +

+ The plugin assumes that pip is available on the node that executes the job. +

+

+ The plugin assumes that the job uses the same pip/python versions as the default ones that are available on the execution node. +

+

+ PYTEST_ADDOPTS and PYTHONPATH environment variables are used for injection. + If these variables are overridden inside the job (with their existing value being discarded rather than preserved), + the injection will not happen. +

+
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html index c09a02fd6..14eb46c98 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html @@ -1,5 +1,4 @@
Enable Datadog Test Visibility for this job. - Any Maven or Gradle build that this job executes will be traced. This requires configuring Datadog Plugin connectivity.
From 0cc32d751a23ed180dbee89dfecfbeb37db8e1d2 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Wed, 23 Aug 2023 15:23:13 +0200 Subject: [PATCH 06/14] Minor documentation update --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 60fd10216..1ced9ebe9 100644 --- a/README.md +++ b/README.md @@ -234,8 +234,6 @@ Before enabling Test Visibility, be sure to properly configure the plugin to sub To enable Test Visibility, go to the `Configure` page of the job or pipeline whose tests need to be traced, tick `Enable Datadog Test Visibility` checkbox in the `General` section and save your changes. -Once Test Visibility is enabled, any Maven or Gradle build that the job or pipeline executes will be traced. - ## Data collected This plugin is collecting the following [events](#events), [metrics](#metrics), and [service checks](#service-checks): From a32f30d06cbd932f694d7eed5854efede58acbbd Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Thu, 31 Aug 2023 20:40:14 +0200 Subject: [PATCH 07/14] Address review comments & add integration tests --- .../tracer/DatadogTracerConfigurator.java | 6 +- .../datadog/tracer/JavaConfigurator.java | 44 +-- .../tracer/JavascriptConfigurator.java | 63 +--- .../datadog/tracer/PythonConfigurator.java | 77 +---- .../datadog/tracer/ShellCommandCallable.java | 33 ++ .../datadog/tracer/TracerInjectionIT.java | 186 +++++++++++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 62547 bytes .../.mvn/wrapper/maven-wrapper.properties | 18 + .../datadog/tracer/test-maven-project/mvnw | 308 ++++++++++++++++++ .../tracer/test-maven-project/mvnw.cmd | 205 ++++++++++++ .../datadog/tracer/test-maven-project/pom.xml | 16 + 11 files changed, 821 insertions(+), 135 deletions(-) create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/ShellCommandCallable.java create mode 100644 src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java create mode 100644 src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/.mvn/wrapper/maven-wrapper.jar create mode 100644 src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/.mvn/wrapper/maven-wrapper.properties create mode 100755 src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/mvnw create mode 100644 src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/mvnw.cmd create mode 100644 src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/pom.xml diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java index 37e671ea3..1b7e931e3 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerConfigurator.java @@ -55,7 +55,7 @@ public Map configure(Run run, Node node, Map configure(Run run, Node node, Map configure(Run run, Node node, Map languageVariables = tracerConfigurator.configure(tracerConfig, node, workspacePath, envs); variables.putAll(languageVariables); } catch (Exception e) { - LOGGER.log(Level.INFO, "Error while configuring " + language + " Datadog Tracer for run " + run + " and node " + node, e); + LOGGER.log(Level.WARNING, "Error while configuring " + language + " Datadog Tracer for run " + run + " and node " + node, e); return Collections.emptyMap(); } } diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java index 2e8054337..72583e352 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java @@ -12,13 +12,15 @@ final class JavaConfigurator implements TracerConfigurator { - private static final String TRACER_DISTRIBUTION_URL = "https://dtdg.co/latest-java-tracer"; + private static final String TRACER_DISTRIBUTION_URL_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_DISTRIBUTION_URL"; + private static final String DEFAULT_TRACER_DISTRIBUTION_URL = "https://dtdg.co/latest-java-tracer"; private static final String TRACER_FILE_NAME = "dd-java-agent.jar"; private static final String TRACER_IGNORE_JENKINS_PROXY_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_IGNORE_JENKINS_PROXY"; private static final String TRACER_JAR_CACHE_TTL_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_JAR_CACHE_TTL_MINUTES"; private static final int DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES = 60 * 12; + private static final int TRACER_DOWNLOAD_TIMEOUT_MILLIS = 60_000; - private final HttpClient httpClient = new HttpClient(60_000); + private final HttpClient httpClient = new HttpClient(TRACER_DOWNLOAD_TIMEOUT_MILLIS); @Override public Map configure(DatadogTracerJobProperty tracerConfig, Node node, FilePath workspacePath, Map envs) throws Exception { @@ -37,7 +39,8 @@ private FilePath downloadTracer(DatadogTracerJobProperty tracerConfig, FilePa return datadogTracerFile.absolutize(); } - httpClient.getBinary(TRACER_DISTRIBUTION_URL, Collections.emptyMap(), is -> { + String tracerDistributionUrl = getTracerDistributionUrl(tracerConfig); + httpClient.getBinary(tracerDistributionUrl, Collections.emptyMap(), is -> { try { datadogTracerFile.copyFrom(is); } catch (Exception e) { @@ -49,30 +52,33 @@ private FilePath downloadTracer(DatadogTracerJobProperty tracerConfig, FilePa } private int getTracerJarCacheTtlMinutes(DatadogTracerJobProperty tracerConfig) { - Map additionalVariables = tracerConfig.getAdditionalVariables(); - if (additionalVariables != null) { - String envVariable = additionalVariables.get(TRACER_JAR_CACHE_TTL_ENV_VAR); - if (envVariable != null) { - try { - return Integer.parseInt(envVariable); - } catch (Exception e) { - // ignored - } - } - } - - String envVariable = System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); - if (envVariable != null) { + String ttl = getEnvVariable(tracerConfig, TRACER_JAR_CACHE_TTL_ENV_VAR); + if (ttl != null) { try { - return Integer.parseInt(envVariable); + return Integer.parseInt(ttl); } catch (Exception e) { // ignored } } - return DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES; } + private String getTracerDistributionUrl(DatadogTracerJobProperty tracerConfig) { + String distributionUrl = getEnvVariable(tracerConfig, TRACER_DISTRIBUTION_URL_ENV_VAR); + return distributionUrl != null ? distributionUrl : DEFAULT_TRACER_DISTRIBUTION_URL; + } + + private String getEnvVariable(DatadogTracerJobProperty tracerConfig, String name) { + Map additionalVariables = tracerConfig.getAdditionalVariables(); + if (additionalVariables != null) { + String envVariable = additionalVariables.get(name); + if (envVariable != null) { + return name; + } + } + return System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); + } + private static Map getEnvVariables(DatadogTracerJobProperty tracerConfig, Node node, FilePath tracerFile, diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavascriptConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavascriptConfigurator.java index 81faaf1df..96cae3b43 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavascriptConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavascriptConfigurator.java @@ -2,71 +2,34 @@ import hudson.FilePath; import hudson.model.Node; -import hudson.remoting.VirtualChannel; -import java.io.File; -import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import jenkins.MasterToSlaveFileCallable; -import org.datadog.jenkins.plugins.datadog.util.ShellCommandExecutor; final class JavascriptConfigurator implements TracerConfigurator { private static final Logger LOGGER = Logger.getLogger(JavascriptConfigurator.class.getName()); + private static final int GET_NPM_VERSION_TIMEOUT_MILLIS = 30_000; + private static final int INSTALL_TRACER_TIMEOUT_MILLIS = 300_000; + @Override public Map configure(DatadogTracerJobProperty tracerConfig, Node node, FilePath workspacePath, Map envs) throws Exception { - try { - String nodeVersion = workspacePath.act(new GetNpmVersion()); - LOGGER.log(Level.FINE, "Got npm version " + nodeVersion + " from " + workspacePath + " on " + node); - - String installTracerOutput = workspacePath.act(new InstallTracer()); - LOGGER.log(Level.FINE, "Trace installed in " + workspacePath + " on " + node + "; output: " + installTracerOutput); - - Path absoluteWorkspacePath = Paths.get(workspacePath.absolutize().getRemote()); - Path tracerPath = absoluteWorkspacePath.resolve("node_modules/dd-trace"); + String nodeVersion = workspacePath.act(new ShellCommandCallable(GET_NPM_VERSION_TIMEOUT_MILLIS, "npm", "-v")); + LOGGER.log(Level.FINE, "Got npm version " + nodeVersion + " from " + workspacePath + " on " + node); - Map variables = new HashMap<>(); - variables.put("DD_TRACE_PATH", tracerPath.toString()); - variables.put("NODE_OPTIONS", PropertyUtils.prepend(envs, "NODE_OPTIONS", "-r ./example.js -r $DD_TRACE_PATH/ci/init")); - return variables; + String installTracerOutput = workspacePath.act(new ShellCommandCallable(INSTALL_TRACER_TIMEOUT_MILLIS, "npm", "install", "dd-trace")); + LOGGER.log(Level.FINE, "Tracer installed in " + workspacePath + " on " + node + "; output: " + installTracerOutput); - } catch (IOException e) { - LOGGER.log(Level.INFO, "Exception while trying to get node version from " + workspacePath + " on " + node + "; assuming node is not installed", e); - return Collections.emptyMap(); - } - } - - private static final class GetNpmVersion extends MasterToSlaveFileCallable { - @Override - public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { - try { - ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 30_000); - return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "npm", "-v"); - } catch (IOException | InterruptedException e) { - throw e; - } catch (Exception e) { - throw new IOException(e); - } - } - } + Path absoluteWorkspacePath = Paths.get(workspacePath.absolutize().getRemote()); + Path tracerPath = absoluteWorkspacePath.resolve("node_modules/dd-trace"); - private static final class InstallTracer extends MasterToSlaveFileCallable { - @Override - public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { - try { - ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 300_000); - return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "npm", "install", "dd-trace"); - } catch (IOException | InterruptedException e) { - throw e; - } catch (Exception e) { - throw new IOException(e); - } - } + Map variables = new HashMap<>(); + variables.put("DD_TRACE_PATH", tracerPath.toString()); + variables.put("NODE_OPTIONS", PropertyUtils.prepend(envs, "NODE_OPTIONS", "-r ./example.js -r $DD_TRACE_PATH/ci/init")); + return variables; } } diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PythonConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PythonConfigurator.java index 527213ef4..d2bb0f6ad 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PythonConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/PythonConfigurator.java @@ -2,45 +2,38 @@ import hudson.FilePath; import hudson.model.Node; -import hudson.remoting.VirtualChannel; -import java.io.File; import java.io.IOException; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import jenkins.MasterToSlaveFileCallable; -import org.datadog.jenkins.plugins.datadog.util.ShellCommandExecutor; final class PythonConfigurator implements TracerConfigurator { private static final Logger LOGGER = Logger.getLogger(PythonConfigurator.class.getName()); + private static final int GET_PIP_VERSION_TIMEOUT_MILLIS = 30_000; + private static final int INSTALL_TRACER_TIMEOUT_MILLIS = 300_000; + private static final int SHOW_TRACER_PACKAGE_DETAILS_TIMEOUT_MILLIS = 300_000; + @Override public Map configure(DatadogTracerJobProperty tracerConfig, Node node, FilePath workspacePath, Map envs) throws Exception { - try { - String pipVersion = workspacePath.act(new GetPipVersion()); - LOGGER.log(Level.FINE, "Got pip version " + pipVersion + " from " + workspacePath + " on " + node); - - String installTracerOutput = workspacePath.act(new InstallTracer()); - LOGGER.log(Level.FINE, "Trace installed in " + workspacePath + " on " + node + "; output: " + installTracerOutput); + String pipVersion = workspacePath.act(new ShellCommandCallable(GET_PIP_VERSION_TIMEOUT_MILLIS, "pip", "-V")); + LOGGER.log(Level.FINE, "Got pip version " + pipVersion + " from " + workspacePath + " on " + node); - String tracerLocation = getTracerLocation(workspacePath); + String installTracerOutput = workspacePath.act(new ShellCommandCallable(INSTALL_TRACER_TIMEOUT_MILLIS, "pip", "install", "-U", "ddtrace")); + LOGGER.log(Level.FINE, "Tracer installed in " + workspacePath + " on " + node + "; output: " + installTracerOutput); - Map variables = new HashMap<>(); - variables.put("PYTEST_ADDOPTS", PropertyUtils.prepend(envs, "PYTEST_ADDOPTS", "--ddtrace")); - variables.put("PYTHONPATH", PropertyUtils.prepend(envs, "PYTHONPATH", tracerLocation + ":")); - return variables; + String tracerLocation = getTracerLocation(workspacePath); - } catch (IOException e) { - LOGGER.log(Level.INFO, "Exception while trying to get node version from " + workspacePath + " on " + node + "; assuming node is not installed", e); - return Collections.emptyMap(); - } + Map variables = new HashMap<>(); + variables.put("PYTEST_ADDOPTS", PropertyUtils.prepend(envs, "PYTEST_ADDOPTS", "--ddtrace")); + variables.put("PYTHONPATH", PropertyUtils.prepend(envs, "PYTHONPATH", tracerLocation + ":")); + return variables; } private static String getTracerLocation(FilePath workspacePath) throws IOException, InterruptedException { - String getTracerLocationOutput = workspacePath.act(new GetTracerLocation()); + String getTracerLocationOutput = workspacePath.act(new ShellCommandCallable(SHOW_TRACER_PACKAGE_DETAILS_TIMEOUT_MILLIS, "pip", "show", "ddtrace")); for (String line : getTracerLocationOutput.split("\n")) { if (line.contains("Location")) { return line.substring(line.indexOf(':') + 2); @@ -48,46 +41,4 @@ private static String getTracerLocation(FilePath workspacePath) throws IOExcepti } throw new IllegalStateException("Could not determine tracer location in " + workspacePath + "; command output is: " + getTracerLocationOutput); } - - private static final class GetPipVersion extends MasterToSlaveFileCallable { - @Override - public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { - try { - ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 30_000); - return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "pip", "-V"); - } catch (IOException | InterruptedException e) { - throw e; - } catch (Exception e) { - throw new IOException(e); - } - } - } - - private static final class InstallTracer extends MasterToSlaveFileCallable { - @Override - public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { - try { - ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 300_000); - return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "pip", "install", "-U", "ddtrace"); - } catch (IOException | InterruptedException e) { - throw e; - } catch (Exception e) { - throw new IOException(e); - } - } - } - - private static final class GetTracerLocation extends MasterToSlaveFileCallable { - @Override - public String invoke(File workspace, VirtualChannel channel) throws IOException, InterruptedException { - try { - ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, 300_000); - return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), "pip", "show", "ddtrace"); - } catch (IOException | InterruptedException e) { - throw e; - } catch (Exception e) { - throw new IOException(e); - } - } - } } diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/ShellCommandCallable.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/ShellCommandCallable.java new file mode 100644 index 000000000..e205a8b28 --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/ShellCommandCallable.java @@ -0,0 +1,33 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import hudson.remoting.VirtualChannel; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import jenkins.MasterToSlaveFileCallable; +import org.datadog.jenkins.plugins.datadog.util.ShellCommandExecutor; + +public class ShellCommandCallable extends MasterToSlaveFileCallable { + private final long timeoutMillis; + private final String[] command; + + public ShellCommandCallable(long timeoutMillis, String... command) { + this.timeoutMillis = timeoutMillis; + this.command = command; + } + + @Override + public String invoke(File workspace, VirtualChannel channel) throws IOException { + try { + ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(workspace, timeoutMillis); + return shellCommandExecutor.executeCommand(new ShellCommandExecutor.ToStringOutputParser(), command); + + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IOException("Interrupted while waiting for shell command: " + Arrays.toString(command)); + + } catch (Exception e) { + throw new IOException("Error running shell command: " + Arrays.toString(command), e); + } + } +} diff --git a/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java b/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java new file mode 100644 index 000000000..2d5b0b382 --- /dev/null +++ b/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java @@ -0,0 +1,186 @@ +package org.datadog.jenkins.plugins.datadog.tracer; + +import hudson.FilePath; +import hudson.model.FreeStyleBuild; +import hudson.model.FreeStyleProject; +import hudson.model.Job; +import hudson.model.Label; +import hudson.model.TopLevelItem; +import hudson.slaves.DumbSlave; +import hudson.tasks.Shell; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Collections; +import org.datadog.jenkins.plugins.datadog.DatadogGlobalConfiguration; +import org.datadog.jenkins.plugins.datadog.DatadogUtilities; +import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; +import org.jenkinsci.plugins.workflow.job.WorkflowJob; +import org.jenkinsci.plugins.workflow.job.WorkflowRun; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TestRule; +import org.jvnet.hudson.test.FlagRule; +import org.jvnet.hudson.test.JenkinsRule; + +public class TracerInjectionIT { + + // "mvn" script does not quote MAVEN_OPTS properly, this is outside of our control + @ClassRule + public static TestRule noSpaceInTmpDirs = FlagRule.systemProperty("jenkins.test.noSpaceInTmpDirs", "true"); + + @ClassRule + public static JenkinsRule jenkinsRule = new JenkinsRule(); + private static DumbSlave agentNode; + + @BeforeClass + public static void suiteSetUp() throws Exception { + DatadogGlobalConfiguration datadogConfig = DatadogUtilities.getDatadogGlobalDescriptor(); + datadogConfig.setReportWith("DSD"); + + agentNode = jenkinsRule.createOnlineSlave(); + } + + @AfterClass + public static void suiteTearDown() throws Exception { + jenkinsRule.disconnectSlave(agentNode); + } + + @Test + public void testTracerInjectionInFreestyleProject() throws Exception { + FreeStyleProject project = givenFreestyleProject(); + try { + givenProjectIsAMavenBuild(project); + givenTracerInjectionEnabled(project); + FreeStyleBuild build = whenRunningBuild(project); + thenTracerIsInjected(build); + } finally { + project.delete(); + } + } + + @Test + public void testTracerInjectionInFreestyleProjectExecutedOnAgentNode() throws Exception { + FreeStyleProject project = givenFreestyleProject(); + try { + givenProjectIsBuiltOnAgentNode(project); + givenProjectIsAMavenBuild(project); + givenTracerInjectionEnabled(project); + FreeStyleBuild build = whenRunningBuild(project); + thenTracerIsInjected(build); + } finally { + project.delete(); + } + } + + @Test + public void testTracerInjectionInPipeline() throws Exception { + WorkflowJob pipeline = givenPipelineProjectBuiltOnMaster(); + try { + givenPipelineIsAMavenBuild(pipeline, false); + givenTracerInjectionEnabled(pipeline); + WorkflowRun build = whenRunningBuild(pipeline); + thenTracerIsInjected(build); + } finally { + pipeline.delete(); + } + } + + @Test + public void testTracerInjectionInPipelineExecutedOnAgentNode() throws Exception { + WorkflowJob pipeline = givenPipelineProjectBuiltOnAgentNode(); + try { + givenPipelineIsAMavenBuild(pipeline, true); + givenTracerInjectionEnabled(pipeline); + WorkflowRun build = whenRunningBuild(pipeline); + thenTracerIsInjected(build); + } finally { + pipeline.delete(); + } + } + + private FreeStyleProject givenFreestyleProject() throws IOException { + return jenkinsRule.createFreeStyleProject("freestyleProject"); + } + + private WorkflowJob givenPipelineProjectBuiltOnMaster() throws Exception { + return givenPipelineProject(false); + } + + private WorkflowJob givenPipelineProjectBuiltOnAgentNode() throws Exception { + return givenPipelineProject(true); + } + + private WorkflowJob givenPipelineProject(boolean builtOnAgentNode) throws Exception { + WorkflowJob job = jenkinsRule.jenkins.createProject(WorkflowJob.class, "pipelineProject"); + String definition = "pipeline {\n" + + " agent {\n" + + " label '" + (builtOnAgentNode ? agentNode.getSelfLabel().getName() : "built-in") + "'\n" + + " }\n" + + " stages {\n" + + " stage('test'){\n" + + " steps {\n" + + " sh \"./mvnw clean\"" + + " }\n" + + " }\n" + + " }\n" + + "}"; + job.setDefinition(new CpsFlowDefinition(definition, true)); + return job; + } + + private void givenProjectIsBuiltOnAgentNode(FreeStyleProject project) throws Exception { + project.setAssignedNode(agentNode); + } + + private void givenProjectIsAMavenBuild(FreeStyleProject project) throws Exception { + copyMavenFilesToWorkspace(agentNode.getSelfLabel().equals(project.getAssignedLabel()), project); + project.getBuildersList().add(new Shell("./mvnw clean")); + } + + private void givenPipelineIsAMavenBuild(WorkflowJob pipeline, boolean builtOnAgent) throws Exception { + copyMavenFilesToWorkspace(builtOnAgent, pipeline); + } + + private void copyMavenFilesToWorkspace(boolean builtOnAgent, TopLevelItem item) throws Exception { + FilePath projectWorkspace; + if (builtOnAgent) { + projectWorkspace = agentNode.getWorkspaceFor(item); + } else { + projectWorkspace = jenkinsRule.jenkins.getWorkspaceFor(item); + } + + URL mavenProjectUrl = TracerInjectionIT.class.getResource("/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project"); + File mavenProject = new File(mavenProjectUrl.getFile()); + FilePath mavenProjectPath = new FilePath(mavenProject); + mavenProjectPath.copyRecursiveTo(projectWorkspace); + } + + private void givenTracerInjectionEnabled(Job job) throws IOException { + DatadogTracerJobProperty traceInjectionConfig = new DatadogTracerJobProperty<>( + true, + "integration-test-service-name", + Collections.singletonList(TracerLanguage.JAVA), + Collections.singletonMap("DD_CIVISIBILITY_ENABLED", "false") + ); + job.addProperty(traceInjectionConfig); + } + + private FreeStyleBuild whenRunningBuild(FreeStyleProject project) throws Exception { + return jenkinsRule.buildAndAssertSuccess(project); + } + + private WorkflowRun whenRunningBuild(WorkflowJob pipeline) throws Exception { + return jenkinsRule.buildAndAssertSuccess(pipeline); + } + + private void thenTracerIsInjected(FreeStyleBuild build) throws IOException { + jenkinsRule.assertLogContains("DATADOG TRACER CONFIGURATION", build); + } + + private void thenTracerIsInjected(WorkflowRun build) throws IOException { + jenkinsRule.assertLogContains("DATADOG TRACER CONFIGURATION", build); + } +} diff --git a/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/.mvn/wrapper/maven-wrapper.jar b/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..cb28b0e37c7d206feb564310fdeec0927af4123a GIT binary patch literal 62547 zcmb5V1CS=sk~Z9!wr$(CZEL#U=Co~N+O}=mwr$(Cds^S@-Tij=#=rmlVk@E|Dyp8$ z$UKz?`Q$l@GN3=8fq)=^fVx`E)Pern1@-q?PE1vZPD);!LGdpP^)C$aAFx&{CzjH` zpQV9;fd0PyFPNN=yp*_@iYmRFcvOrKbU!1a*o)t$0ex(~3z5?bw11HQYW_uDngyer za60w&wz^`W&Z!0XSH^cLNR&k>%)Vr|$}(wfBzmSbuK^)dy#xr@_NZVszJASn12dw; z-KbI5yz=2awY0>OUF)&crfPu&tVl|!>g*#ur@K=$@8N05<_Mldg}X`N6O<~3|Dpk3 zRWb!e7z<{Mr96 z^C{%ROigEIapRGbFA5g4XoQAe_Y1ii3Ci!KV`?$ zZ2Hy1VP#hVp>OOqe~m|lo@^276Ik<~*6eRSOe;$wn_0@St#cJy}qI#RP= zHVMXyFYYX%T_k3MNbtOX{<*_6Htq*o|7~MkS|A|A|8AqKl!%zTirAJGz;R<3&F7_N z)uC9$9K1M-)g0#}tnM(lO2k~W&4xT7gshgZ1-y2Yo-q9Li7%zguh7W#kGfnjo7Cl6 z!^wTtP392HU0aVB!$cPHjdK}yi7xNMp+KVZy3_u}+lBCloJ&C?#NE@y$_{Uv83*iV zhDOcv`=|CiyQ5)C4fghUmxmwBP0fvuR>aV`bZ3{Q4&6-(M@5sHt0M(}WetqItGB1C zCU-)_n-VD;(6T1%0(@6%U`UgUwgJCCdXvI#f%79Elbg4^yucgfW1^ zNF!|C39SaXsqU9kIimX0vZ`U29)>O|Kfs*hXBXC;Cs9_Zos3%8lu)JGm~c19+j8Va z)~kFfHouwMbfRHJ``%9mLj_bCx!<)O9XNq&uH(>(Q0V7-gom7$kxSpjpPiYGG{IT8 zKdjoDkkMTL9-|vXDuUL=B-K)nVaSFd5TsX0v1C$ETE1Ajnhe9ept?d;xVCWMc$MbR zL{-oP*vjp_3%f0b8h!Qija6rzq~E!#7X~8^ZUb#@rnF~sG0hx^Ok?G9dwmit494OT z_WQzm_sR_#%|I`jx5(6aJYTLv;3U#e@*^jms9#~U`eHOZZEB~yn=4UA(=_U#pYn5e zeeaDmq-$-)&)5Y}h1zDbftv>|?GjQ=)qUw*^CkcAG#o%I8i186AbS@;qrezPCQYWHe=q-5zF>xO*Kk|VTZD;t={XqrKfR|{itr~k71VS?cBc=9zgeFbpeQf*Wad-tAW7(o ze6RbNeu31Uebi}b0>|=7ZjH*J+zSj8fy|+T)+X{N8Vv^d+USG3arWZ?pz)WD)VW}P z0!D>}01W#e@VWTL8w1m|h`D(EnHc*C5#1WK4G|C5ViXO$YzKfJkda# z2c2*qXI-StLW*7_c-%Dws+D#Kkv^gL!_=GMn?Y^0J7*3le!!fTzSux%=1T$O8oy8j z%)PQ9!O+>+y+Dw*r`*}y4SpUa21pWJ$gEDXCZg8L+B!pYWd8X;jRBQkN_b=#tb6Nx zVodM4k?gF&R&P=s`B3d@M5Qvr;1;i_w1AI=*rH(G1kVRMC`_nohm~Ie5^YWYqZMV2<`J* z`i)p799U_mcUjKYn!^T&hu7`Lw$PkddV&W(ni)y|9f}rGr|i-7nnfH6nyB$Q{(*Nv zZz@~rzWM#V@sjT3ewv9c`pP@xM6D!StnV@qCdO${loe(4Gy00NDF5&@Ku;h2P+Vh7 z(X6De$cX5@V}DHXG?K^6mV>XiT768Ee^ye&Cs=2yefVcFn|G zBz$~J(ld&1j@%`sBK^^0Gs$I$q9{R}!HhVu|B@Bhb29PF(%U6#P|T|{ughrfjB@s- zZ)nWbT=6f6aVyk86h(0{NqFg#_d-&q^A@E2l0Iu0(C1@^s6Y-G0r32qll>aW3cHP# zyH`KWu&2?XrIGVB6LOgb+$1zrsW>c2!a(2Y!TnGSAg(|akb#ROpk$~$h}jiY&nWEz zmMxk4&H$8yk(6GKOLQCx$Ji-5H%$Oo4l7~@gbHzNj;iC%_g-+`hCf=YA>Z&F)I1sI z%?Mm27>#i5b5x*U%#QE0wgsN|L73Qf%Mq)QW@O+)a;#mQN?b8e#X%wHbZyA_F+`P%-1SZVnTPPMermk1Rpm#(;z^tMJqwt zDMHw=^c9%?#BcjyPGZFlGOC12RN(i`QAez>VM4#BK&Tm~MZ_!#U8PR->|l+38rIqk zap{3_ei_txm=KL<4p_ukI`9GAEZ+--)Z%)I+9LYO!c|rF=Da5DE@8%g-Zb*O-z8Tv zzbvTzeUcYFgy{b)8Q6+BPl*C}p~DiX%RHMlZf;NmCH;xy=D6Ii;tGU~ zM?k;9X_E?)-wP|VRChb4LrAL*?XD6R2L(MxRFolr6GJ$C>Ihr*nv#lBU>Yklt`-bQ zr;5c(o}R!m4PRz=CnYcQv}m?O=CA(PWBW0?)UY)5d4Kf;8-HU@=xMnA#uw{g`hK{U zB-EQG%T-7FMuUQ;r2xgBi1w69b-Jk8Kujr>`C#&kw-kx_R_GLRC}oum#c{je^h&x9 zoEe)8uUX|SahpME4SEog-5X^wQE0^I!YEHlwawJ|l^^0kD)z{o4^I$Eha$5tzD*A8 zR<*lss4U5N*JCYl;sxBaQkB3M8VT|gXibxFR-NH4Hsmw|{={*Xk)%!$IeqpW&($DQ zuf$~fL+;QIaK?EUfKSX;Gpbm8{<=v#$SrH~P-it--v1kL>3SbJS@>hAE2x_k1-iK# zRN~My-v@dGN3E#c!V1(nOH>vJ{rcOVCx$5s7B?7EKe%B`bbx(8}km#t2a z1A~COG(S4C7~h~k+3;NkxdA4gbB7bRVbm%$DXK0TSBI=Ph6f+PA@$t){_NrRLb`jp zn1u=O0C8%&`rdQgO3kEi#QqiBQcBcbG3wqPrJ8+0r<`L0Co-n8y-NbWbx;}DTq@FD z1b)B$b>Nwx^2;+oIcgW(4I`5DeLE$mWYYc7#tishbd;Y!oQLxI>?6_zq7Ej)92xAZ z!D0mfl|v4EC<3(06V8m+BS)Vx90b=xBSTwTznptIbt5u5KD54$vwl|kp#RpZuJ*k) z>jw52JS&x)9&g3RDXGV zElux37>A=`#5(UuRx&d4qxrV<38_w?#plbw03l9>Nz$Y zZS;fNq6>cGvoASa2y(D&qR9_{@tVrnvduek+riBR#VCG|4Ne^w@mf2Y;-k90%V zpA6dVw|naH;pM~VAwLcQZ|pyTEr;_S2GpkB?7)+?cW{0yE$G43`viTn+^}IPNlDo3 zmE`*)*tFe^=p+a{a5xR;H0r=&!u9y)kYUv@;NUKZ)`u-KFTv0S&FTEQc;D3d|KEKSxirI9TtAWe#hvOXV z>807~TWI~^rL?)WMmi!T!j-vjsw@f11?#jNTu^cmjp!+A1f__Dw!7oqF>&r$V7gc< z?6D92h~Y?faUD+I8V!w~8Z%ws5S{20(AkaTZc>=z`ZK=>ik1td7Op#vAnD;8S zh<>2tmEZiSm-nEjuaWVE)aUXp$BumSS;qw#Xy7-yeq)(<{2G#ap8z)+lTi( ziMb-iig6!==yk zb6{;1hs`#qO5OJQlcJ|62g!?fbI^6v-(`tAQ%Drjcm!`-$%Q#@yw3pf`mXjN>=BSH z(Nftnf50zUUTK;htPt0ONKJq1_d0!a^g>DeNCNpoyZhsnch+s|jXg1!NnEv%li2yw zL}Y=P3u`S%Fj)lhWv0vF4}R;rh4&}2YB8B!|7^}a{#Oac|%oFdMToRrWxEIEN<0CG@_j#R4%R4i0$*6xzzr}^`rI!#y9Xkr{+Rt9G$*@ zQ}XJ+_dl^9@(QYdlXLIMI_Q2uSl>N9g*YXMjddFvVouadTFwyNOT0uG$p!rGF5*`1 z&xsKPj&;t10m&pdPv+LpZd$pyI_v1IJnMD%kWn{vY=O3k1sJRYwPoDV1S4OfVz4FB z$^ygjgHCW=ySKSsoSA&wSlq83JB+O-)s>>e@a{_FjB{@=AlrX7wq>JE=n@}@fba(;n4EG| zge1i)?NE@M@DC5eEv4; z#R~0aNssmFHANL@-eDq2_jFn=MXE9y>1FZH4&v<}vEdB6Kz^l)X%%X@E#4)ahB(KY zx8RH+1*6b|o1$_lRqi^)qoLs;eV5zkKSN;HDwJIx#ceKS!A$ZJ-BpJSc*zl+D~EM2 zm@Kpq2M*kX`;gES_Dd1Y#UH`i!#1HdehqP^{DA-AW^dV(UPu|O@Hvr>?X3^~=1iaRa~AVXbj z-yGL<(5}*)su2Tj#oIt+c6Gh}$0|sUYGGDzNMX+$Oi$e&UJt3&kwu)HX+XP{es(S3 z%9C9y({_fu>^BKjI7k;mZ4DKrdqxw`IM#8{Sh?X(6WE4S6-9M}U0&e32fV$2w{`19 zd=9JfCaYm@J$;nSG3(|byYDqh>c%`JW)W*Y0&K~g6)W?AvVP&DsF_6!fG3i%j^Q>R zR_j5@NguaZB{&XjXF+~6m|utO*pxq$8?0GjW0J-e6Lnf0c@}hvom8KOnirhjOM7!n zP#Iv^0_BqJI?hR5+Dl}p!7X}^NvFOCGvh9y*hgik<&X)3UcEBCdUr$Dt8?0f&LSur ze*n!(V(7umZ%UCS>Hf(g=}39OcvGbf2+D;OZ089m_nUbdCE0PXJfnyrIlLXGh2D!m zK=C#{JmoHY1ws47L0zeWkxxV=A%V8a&E^w%;fBp`PN_ndicD@oN?p?Bu~20>;h;W` ztV=hI*Ts$6JXOwOY?sOk_1xjzNYA#40dD}|js#3V{SLhPEkn5>Ma+cGQi*#`g-*g56Q&@!dg)|1YpLai3Bu8a;l2fnD6&)MZ~hS%&J}k z2p-wG=S|5YGy*Rcnm<9VIVq%~`Q{g(Vq4V)CP257v06=M2W|8AgZO0CC_}HVQ>`VU zy;2LDlG1iwIeMj?l40_`21Qsm?d=1~6f4@_&`lp~pIeXnR)wF0z7FH&wu~L~mfmMr zY4_w6tc{ZP&sa&Ui@UxZ*!UovRT})(p!GtQh~+AMZ6wcqMXM*4r@EaUdt>;Qs2Nt8 zDCJi#^Rwx|T|j_kZi6K!X>Ir%%UxaH>m6I9Yp;Sr;DKJ@{)dz4hpG>jX?>iiXzVQ0 zR$IzL8q11KPvIWIT{hU`TrFyI0YQh`#>J4XE*3;v^07C004~FC7TlRVVC}<}LC4h_ zZjZ)2*#)JyXPHcwte!}{y%i_!{^KwF9qzIRst@oUu~4m;1J_qR;Pz1KSI{rXY5_I_ z%gWC*%bNsb;v?>+TbM$qT`_U8{-g@egY=7+SN#(?RE<2nfrWrOn2OXK!ek7v`aDrH zxCoFHyA&@^@m+#Y(*cohQ4B76me;)(t}{#7?E$_u#1fv)vUE5K;jmlgYI0$Mo!*EA zf?dx$4L(?nyFbv|AF1kB!$P_q)wk1*@L0>mSC(A8f4Rgmv1HG;QDWFj<(1oz)JHr+cP|EPET zSD~QW&W(W?1PF-iZ()b|UrnB(#wG^NR!*X}t~OS-21dpXq)h)YcdA(1A`2nzVFax9rx~WuN=SVt`OIR=eE@$^9&Gx_HCfN= zI(V`)Jn+tJPF~mS?ED7#InwS&6OfH;qDzI_8@t>In6nl zo}q{Ds*cTG*w3CH{Mw9*Zs|iDH^KqmhlLp_+wfwIS24G z{c@fdgqy^Y)RNpI7va^nYr9;18t|j=AYDMpj)j1oNE;8+QQ)ap8O??lv%jbrb*a;} z?OvnGXbtE9zt;TOyWc|$9BeSGQbfNZR`o_C!kMr|mzFvN+5;g2TgFo8DzgS2kkuw@ z=`Gq?xbAPzyf3MQ^ZXp>Gx4GwPD))qv<1EreWT!S@H-IpO{TPP1se8Yv8f@Xw>B}Y z@#;egDL_+0WDA)AuP5@5Dyefuu&0g;P>ro9Qr>@2-VDrb(-whYxmWgkRGE(KC2LwS z;ya>ASBlDMtcZCCD8h+Awq1%A|Hbx)rpn`REck#(J^SbjiHXe-jBp!?>~DC7Wb?mC z_AN+^nOt;3tPnaRZBEpB6s|hCcFouWlA{3QJHP!EPBq1``CIsgMCYD#80(bsKpvwO)0#)1{ zos6v&9c=%W0G-T@9sfSLxeGZvnHk$SnHw57+5X4!u1dvH0YwOvuZ7M^2YOKra0dqR zD`K@MTs(k@h>VeI5UYI%n7#3L_WXVnpu$Vr-g}gEE>Y8ZQQsj_wbl&t6nj{;ga4q8SN#Z6cBZepMoyv7MF-tnnZp*(8jq848yZ zsG_fP$Y-rtCAPPI7QC^nzQjlk;p3tk88!1dJuEFZ!BoB;c!T>L>xSD<#+4X%*;_IB z0bZ%-SLOi5DV7uo{z}YLKHsOHfFIYlu8h(?gRs9@bbzk&dkvw*CWnV;GTAKOZfbY9 z(nKOTQ?fRRs(pr@KsUDq@*P`YUk4j=m?FIoIr)pHUCSE84|Qcf6GucZBRt;6oq_8Z zP^R{LRMo?8>5oaye)Jgg9?H}q?%m@2bBI!XOOP1B0s$%htwA&XuR`=chDc2)ebgna zFWvevD|V882V)@vt|>eeB+@<-L0^6NN%B5BREi8K=GwHVh6X>kCN+R3l{%oJw5g>F zrj$rp$9 zhepggNYDlBLM;Q*CB&%w zW+aY{Mj{=;Rc0dkUw~k)SwgT$RVEn+1QV;%<*FZg!1OcfOcLiF@~k$`IG|E8J0?R2 zk?iDGLR*b|9#WhNLtavx0&=Nx2NII{!@1T78VEA*I#65C`b5)8cGclxKQoVFM$P({ zLwJKo9!9xN4Q8a2F`xL&_>KZfN zOK?5jP%CT{^m4_jZahnn4DrqgTr%(e_({|z2`C2NrR6=v9 z*|55wrjpExm3M&wQ^P?rQPmkI9Z9jlcB~4IfYuLaBV95OGm#E|YwBvj5Z}L~f`&wc zrFo!zLX*C{d2}OGE{YCxyPDNV(%RZ7;;6oM*5a>5LmLy~_NIuhXTy-*>*^oo1L;`o zlY#igc#sXmsfGHA{Vu$lCq$&Ok|9~pSl5Q3csNqZc-!a;O@R$G28a@Sg#&gnrYFsk z&OjZtfIdsr%RV)bh>{>f883aoWuYCPDP{_)%yQhVdYh;6(EOO=;ztX1>n-LcOvCIr zKPLkb`WG2;>r)LTp!~AlXjf-Oe3k`Chvw$l7SB2bA=x3s$;;VTFL0QcHliysKd^*n zg-SNbtPnMAIBX7uiwi&vS)`dunX$}x)f=iwHH;OS6jZ9dYJ^wQ=F#j9U{wJ9eGH^#vzm$HIm->xSO>WQ~nwLYQ8FS|?l!vWL<%j1~P<+07ZMKkTqE0F*Oy1FchM z2(Nx-db%$WC~|loN~e!U`A4)V4@A|gPZh`TA18`yO1{ z(?VA_M6SYp-A#%JEppNHsV~kgW+*Ez=?H?GV!<$F^nOd+SZX(f0IoC#@A=TDv4B2M z%G-laS}yqR0f+qnYW_e7E;5$Q!eO-%XWZML++hz$Xaq@c%2&ognqB2%k;Cs!WA6vl z{6s3fwj*0Q_odHNXd(8234^=Asmc0#8ChzaSyIeCkO(wxqC=R`cZY1|TSK)EYx{W9 z!YXa8GER#Hx<^$eY>{d;u8*+0ocvY0f#D-}KO!`zyDD$%z1*2KI>T+Xmp)%%7c$P< zvTF;ea#Zfzz51>&s<=tS74(t=Hm0dIncn~&zaxiohmQn>6x`R+%vT%~Dhc%RQ=Cj^ z&%gxxQo!zAsu6Z+Ud#P!%3is<%*dJXe!*wZ-yidw|zw|C`cR z`fiF^(yZt?p{ZX|8Ita)UC$=fg6wOve?w+8ww|^7OQ0d zN(3dmJ@mV8>74I$kQl8NM%aC+2l?ZQ2pqkMs{&q(|4hwNM z^xYnjj)q6uAK@m|H$g2ARS2($e9aqGYlEED9sT?~{isH3Sk}kjmZ05Atkgh^M6VNP zX7@!i@k$yRsDK8RA1iqi0}#Phs7y(bKYAQbO9y=~10?8cXtIC4@gF#xZS;y3mAI`h zZ^VmqwJ%W>kisQ!J6R?Zjcgar;Il%$jI*@y)B+fn^53jQd0`)=C~w%Lo?qw!q3fVi{~2arObUM{s=q)hgBn64~)W0tyi?(vlFb z>tCE=B1cbfyY=V38fUGN(#vmn1aY!@v_c70}pa(Lrle-(-SH8Nd!emQF zf3kz0cE~KzB%37B24|e=l4)L}g1AF@v%J*A;5F7li!>I0`lfO9TR+ak`xyqWnj5iwJ$>t_vp(bet2p(jRD;5Q9x2*`|FA4#5cfo8SF@cW zeO{H7C0_YJ*P@_BEvm2dB}pUDYXq@G1^Ee#NY9Q`l`$BUXb01#lmQk^{g3?aaP~(* zD;INgi#8TDZ&*@ZKhx$jA^H-H1Lp`%`O{Y{@_o!+7ST}{Ng^P;X>~Bci{|Qdf1{}p z_kK+zL;>D30r6~R?|h!5NKYOi6X&I5)|ME+NG>d9^`hxKpU^)KBOpZiU^ z;|SzGWtbaclC-%9(zR-|q}kB8H&($nsB1LPAkgcm+Qs@cAov{IXxo5PHrH(8DuEMb z3_R#>7^jjGeS7$!`}m8!8$z|)I~{dhd)SvoH9oR9#LjO{{8O&r7w{d9V1z^syn&E6 z{DG0vlQF_Yb3*|>RzVop^{$mWp|%NDYj@4{d*-@O^<(=L=DMFIQHEp-dtz@1Rumd; zadt^4B#(uUyM6aeUJkGl0GfaULpR!2Ql&q$nEV^+SiDptdPbuJ=VJ)`czZ@&HPUuj zc5dSRB&xk)dI~;6N?wkzI}}4K3i%I=EnlKGpPJ9hu?mNzH7|H0j(mN3(ubdaps3GM z1i+9gk=!$mH=L#LRDf4!mXw0;uxSUIXhl|#h*uK+fQPilJc8RCK9GNPt=X^8`*;3$ zBBo77gkGB5F8a8)*OR10nK&~8CEMPVQyhY>i`PS{L^-*WAz$ljtU%zlG1lm%%U4Zw zms0oZR8b|`>4U1X*9JLQQ>m9MF5%ppoafz^;`7DbmmIENrc$hucekkE4I83WhT%(9 zMaE;f7`g4B#vl(#tNP8$3q{$&oY*oa0HLX6D?xTW3M6f<^{%CK4OE1Pmfue`M6Dh= z&Z-zrq$^xhP%|hU&)(+2KSSpeHgX^0?gRZ5wA8@%%9~@|*Ylux1M{WQ4ekG(T+_b` zb6I)QRGp%fRF)^T?i^j&JDBhfNU9?>Sl6WVMM%S?7< ze|4gaDbPooB=F4Y=>~_+y~Q1{Ox@%q>v+_ZIOfnz5y+qy zhi+^!CE*Lv-}>g^%G=bGLqD(aTN;yHDBH#tOC=X02}QU~Xdme``Wn>N>6{VwgU~Z>g+0 zxv0`>>iSfu$baHMw8(^FL6QWe;}(U>@;8j)t)yHAOj?SdeH;evFx-kpU@nT>lsrUt zqhV}2pD^5bC4786guG1`5|fK@pE6xcT#ns)vR|^?A08G62teHaE&p`ZrCBj_Swt*~dVt=5*RK6Y{% zABqK$X59BnrK3r3u=wxklRnA1uh+q`?T0kE1YhvDWF4OY#<(+V|R@R%tdkq2huF(!Ip+EpZF3zr*|9pmKHPo)Cu z;H+^s&`Ql}u=Jt~ZWj`bAw|i-3#7(2WuRU3DU{BW8`?!O?YO1M$*MMTsaEM!5Jyp~ z!gp6yR4$O%wQ8%dyz43ZPeoJwy;o;yg=S0^Y}%|)to>=N^`!3VMf1~}OZ`Dl$q&|w z9$!i3!i1uAgPTuKSWdBrDr*N$g=E#mdqfj*h;Z}OG`{n245+g;IKfdn!&gF2OtHaD zyGDzj@@d2!P(_Ux)3v;1ABTj__{w*kaRF-1YVU`})Acgk?(T*1YqEve3=5)8bkZK* z!Tus*e$h@^u z>#zV0771Bix~r&h2FJ9)%N{>s>?2tk1$bId)1#G;OKgn-U8jUo^AK;Hu)hQEi}swD(264kAS-SBCD$R(Ro0rh8~Le zzRwxbz_JHDbD+hTX15AWmVw!#rC)-zeZahQQmo6FG1)ah3uuyIuTMof}RO!`Y3^Fxn_-G$23RDOh(@NU?r6`*S?#E50)w zpcsgDZ-iO{;EesgDQq9;p*C#QH(sp~2w^zAJWaUL%@yo)iIL6y8;e_}=dwQc%k%;H zFt5lenH*`}LWd+fPqi;exJeRZgl&nLR%|a!%1x0RQ54cgyWBYrL>sskcAtPxi&8c( zw_K?sI*3n%S;lKiYpveBN08{rgV&-B1NN5Jiu07~%n#%&f!(R(z1)xsxtRBkg#+Lv zh21zX?aYDd_f}qdA`Os*j!eC<5)iUJ&Twj7?*p%vEOGElGhpRZsccM!<k}DeC;TY;rULQs3e}lZyP#UVb=6 zB$Dkm2FaHWUXr7<{R&46sfZ)&(HXxB_=e`%LZci`s7L6c-L7iF&wdmTJz`*^=jD~* zpOZ@jcq8LezVkE^M6D9^QgZqnX&x*mr1_Cf#R9R3&{i3%v#}V$UZzGC;Or*=Dw5SXBC6NV|sGZp^#%RTimyaj@!ZuyJ z6C+r}O1TsAzV9PAa*Gd!9#FQMl)ZLHzTr99biAqA(dz-m9LeIeKny3YB=*+|#-Gq# zaErUR5Z*Wh^e<+wcm70eW;f-g=YTbMiDX)AznDM6B73)T4r%nq+*hKcKF?)#vbv?K zPMe=sFCuC*ZqsBPh-?g!m*O`}6<}Pfj}Y1n9|Y@cUdD5GX_)6Sx9pPfS7 zxkt?g6ZwJ+50C7qrh6dMFmr7qah`FskT_H=GC92vkVh$WfZa2%5L99_DxyM{$#6HQ zx$VR-Wwt!q9JL2{ybEGJr$^?!V4m_BqDqt!mbs=QjHf340+^a{)waVvP0+98(BA$M ztWr&sM=juyYgvf`(SC}+y@QtYgU>0ghJ6VbU}|kEraR&&W%#;!#KI?le%g`e>ZVPiDrneh#&1(Y?uiMo^f5qo@{JEr(p9>8GhDa+PC9yG;lX+D?hQ^fZB&Sdox219zUj_5;+n<0@Wi3@DK`MU8FM!OFJ z8*_mTA-u!Ab#95FRVWTIqAL#BVQGxE_s?>Ql|@0o9vos&r<_4d!+Q6(_270)6#lu$ zV!j$a?_V0I<(3Z=J7C-K0a^Kc1Go9p&T6yQeAD+)dG-$a&%Fo0AOte~_Z&_m2@ue~ z9cKFf-A41Dz31Ooj9FSR`l?H5UtdP?JS=UU$jF#znE1k@0g%K?KQuwZkfDI3Ai)(q z#x_Yo6WR_Y@#6I_02S&NpcP<%sw!!M_3#*8qa+*4rS@x=i{-2K#*Qr)*Q$-{<_(<| z0730e+rubnT38*m;|$-4!1r6u&Ua2kO_s-(7*NGgDTe##%I>_9uW;X__b_k)xlv$; zW%K2hsmr>5e^Z~`tS-eUgWmSF9}Yg8E}qydSVX0nYZMX_x94QK?tw2>^;raVTqstR zIrNAX2`X~|h->dTOb9IrA!i5INpLV}99ES|i0ldzC`;R$FBY5&7+TIy8%GO8SZ37_ zw=^Swk?z+j-&0-cTE|LU0q@IKRa&C6ZlXbSa2vN5r-)*f<3{wLV*uJUw980AFkWN7 zKh{?97GmVu-0rs9FB6ludy|n`gN5p~?y51aJzBg6#+-=0pWdZ2n4xTiQ=&3As-!-6 zFlb|ssAJEJL#s8(=odfz8^9b#@RrvNE4gjuEITzAd7R4+rq$yEJKXP?6D@yM7xZ&^ z@%jnE3}bteJo{p(l`hu`Yvzg9I#~>(T;>c;ufeLfc!m3D&RaQS=gAtEO-WbI+f_#| zaVpq-<%~=27U8*qlVCuI6z9@j)#R!z3{jc>&I(qT-8IBW57_$z5Qm3gVC1TcWJNc% zDk?H3%QHno@fu9nT%L^K)=#sRiRNg|=%M zR;8BE)QA4#Dsg^EakzttRg9pkfIrF3iVYVM#*_+#3X+~qeZc^WQJvEyVlO@9=0pl!ayNOh|{j0j^a z+zi_$_0QKhwArW)sJ$wji;A`?$ecbr?(4x5%2pLgh#wggbt)#T^2R3a9m+>GcrUxU z*u-WTgHAN*e!0;Wa%1k)J_P(Vdp>vwrROTVae@6Wn04q4JL-)g&bWO6PWGuN2Q*s9 zn47Q2bIn4=!P1k0jN_U#+`Ah59zRD??jY?s;U;k@%q87=dM*_yvLN0->qswJWb zImaj{Ah&`)C$u#E0mfZh;iyyWNyEg;w0v%QS5 zGXqad{`>!XZJ%+nT+DiVm;lahOGmZyeqJ-;D&!S3d%CQS4ZFM zkzq5U^O|vIsU_erz_^^$|D0E3(i*&fF-fN}8!k3ugsUmW1{&dgnk!|>z2At?h^^T@ zWN_|`?#UM!FwqmSAgD6Hw%VM|fEAlhIA~^S@d@o<`-sxtE(|<><#76_5^l)Xr|l}Q zd@7Fa8Bj1ICqcy2fKl1rD4TYd84)PG5Ee2W4Nt@NNmpJWvc3q@@*c;~%^Vasf2H`y z+~U-19wtFT?@yIFc4SE_ab?s@wEUfSkOED}+qVjjy>=eac2^S^+|_3%cjH%EUTJ&r znp9q?RbStJcT*Vi{3KDa^jr4>{5x+?!1)8c2SqiCEzE$TQ+`3KPQQnG8_Qk<^)y_o zt1Q^f{#yCUt!1e(3;E6y?>p+7sGAYLp`lA3c~Y`re9q&`c6>0?c0E2Ap5seFv92#X z1Vldj!7A8@8tWr&?%;EBQ_Fwd)8A3!wIx`V!~~h(!$pCy7=&*+*uIzG@*d%*{qG#4 zX0^}}sRN^N=p{w(+yjv%xwb!%lnVTE7l1l6gJwQmq_G83J&Y98$S!r*L8}IiIa2E= zE!0tbOuEDb*No0-KB{zjo1k#_4FHtr{!)>o+Y@bll}Sa6D^xktI0H&l{jKAK)A(iz zB-N00F?~Z}Y7tG+vp)-q*v71(C}65$-=uXx^|R$xx9zZip-V>Hqeyfd(wteM)+!!H z$s+>g4I@+`h2>C|J;PhvtOq)`xm4;CyF}R<)!ma3T{Vf_5|zo;D4YI4ZDBkE(vMeE zb#ZV;n}CgA0w8x!UC2&5Z(K)9bibj#?~>R(72lFx_Am~jS?;7mo~p+05~XGD+(wV4 zEVYnf0N5+-7O+Gc1L!sPGUHv<6=cV8}*m$m`kBs@z zy;goR(?J^JrB7uXXpD00+SD0luk!vK3wwp(N%|X!HmO{xC#OMYQ&a7Yqv-54iEUK4 zVH;)rY6)pUX~ESvQK^w|&}>J{I?YlvOhpMgt-JB}m5Br`Q9X+^8+Xa%S81hO<1t#h zbS+MljFP1J0GGNR1}KwE=cfey%;@n&@Kli+Z5d>daJjbvuO3dW{r$1FT0j zR$c9$t~P50P+NhG^krLH%k}wsQ%mm+@#c;-c9>rYy;8#(jZ|KA8RrmnN2~>w0ciU7 zGiLC?Q^{^Ox-9F()RE^>Xq(MAbGaT0^6jc>M5^*&uc@YGt5Iw4i{6_z5}H$oO`arY z4BT(POK%DnxbH>P$A;OWPb@gYS96F7`jTn6JO@hdM za>_p!1mf?ULJZb1w-+HamqN__2CtI%VK`k^(++Ga0%z*z@k0wYJDqT^)~%|4O299; zh1_iRtc7you(kOK8?Q$R7v-@Qk4+i=8GD2_zI0%{Ra`_prF{+UPW^m5MCA&4ZUpZb z2*!)KA8b--Upp~U%f+rsmCmV~!Y>Gzl#yVvZER2h;f&rkdx{r#9mc8DZMJaQXs?SL zCg3#>xR6ve8&YkP*`Z=lng|Ow+h@t*!Ial*XQg3P;VS8@E1C)VS`?L9N+rxlD7bxC z3@Ag)Vu?#ykY`ND+GvRYTUP&-KDMiqly$Z~uFXt^)4Jjk9RIs*&$?-UPM*d7&m${m zm12kaN3mV1J|c6f$>V+{lvHp~XVW3DU0;cBR>7|)4bo{xa1-ts-lYU-Q-b)_fVVl`EP5X}+J9EzT20x8XIv=m7witdu7!3Lh=KE#OyKpT1GWk{YAo^ny|fvZt<+jmsFs=l*%e& zmRkBt5ccv4O7!HAyv2~rsq*(FmMTm?@TX3&1`nu|7C^F{ad%GLuoX}Rl}6`)uHF_xlx^gVca+mGH4T8u8;q{S*x3=j;kelz^atO~)v!Q_BT z4H6%IA}bvfuk0_vweELeEl8N5w-Q1GF!@f{VKnbyYB2?}d&QvI-j}~RI_+9t9$tC2 z94m=3eLi=sQb^S5;fqP?3aaXc&`}`lq z&M8dOXvxx9Y1^u_ZQHhO+qP}nwkvJhwoz$Mp6Qcq^7M#eWm}!3U@s07hop` zW24|J{t$aB`W>uBTssEvYMyi$hkaOqWh+^(RV_1MYnE0XPgW?7sBDk=Cqs(;$qrPEflqa0ZE?A3cBfW%0RPA235Wb6@=R_d>Sez; z`spwa50bq?-zh+id~Q!T`AYn`$GHzs;jxIw(A1_Ql&f|qP}|bon#H;sjKmSDM!nyn z>bU8l%3DB3F+$}|J^da!!pN|DO!Ndc2J)wMk!+Rr1hes#V}5o(?(yQSphn|9_aU<- zn|nsDS{^x&tweP;Ft`2ur>Koo2IdXJDsr6IN)7vB41Yy-^Wbo9*2th2QA@C zE0-0Gk12YOO?d_Guu6b3&(PIL`d zh4{`k54hu9o%v1K3PGuccez-wdC<&2fp)>`qIIaf)R{5un7-vwm=>LD7ibnJ$|KyE zzw`X*tM0S|V(I3vf454PY{yA5lbE+36_<1kd=&0Xy4jfvUKZ0$Jq!AG4KS7DrE9rph;dK^6*#CIU9qu7 z?)6O`TN&MCWGmUVd1@E2ow2`vZ1A#nGo8_n!dmX77DCgAP1va*ILU+!a&$zdm6Pa6 z4#|*&3dM+r_RJb%!0}7X!An&T4a4@ejqNJ;=1YVQ{J6|oURuj8MBZ8i7l=zz%S4-; zL}=M^wU43lZVwNJgN|#xIfo$aZfY#odZ6~z?aNn=oR1@zDb=a(o3w`IGu&j>6lYxL z&MtqINe4Z>bdsHNkVIu$Dbq0wc#X-xev221e~L zbm8kJ(Xzij$gF4Ij0(yuR?H1hShSy@{WXsHyKtAedk4O!IdpR{E32Oqp{1TD{usJi zGG@{3A$x%R*pp8b$RQo4w&eDhN`&b~iZ2m3U>@9p1o5kXoEVmHX7I6Uw4dn((mFw` zilWrqFd=F5sH$&*(eJB52zaLwRe zz`sruIc=Ck75>v5P5kd>B2u=drvGPg6s&k5^W!%CDxtRO)V6_Y_QP{%7B>E~vyMLG zhrfn8kijyK&bX+rZsnSJ26!j$1x+V!Pyn|ph%sXWr9^f&lf|C;+I^Fi_4;`-LJI&F zr;5O@#4jZX=Yaw0`pUyfF4J8A9wE#7_9!X|_s8~YUzWu&#E^%4NxUA3*jK-F5R3LP2|msHBLmiMIzVpPAEX)2 zLKYjm3VI4r#7|nP^}-}rL+Q4?LqlmBnbL+R8P%8VmV{`wP0=~2)LptW_i682*sUR# z+EifOk_cWVKg-iWr^Qf4cs^3&@BFRC6n0vu{HqZzNqW1{m)3K@gi$i}O(hT`f#bT- z8PqCdSj~FncPNmMKl9i9QPH1OMhvd42zLL~qWVup#nIJRg_?7KQ-g3jGTt5ywN;Qx zwmz4dddJYIOsC8VqC2R%NQ>zm=PJH70kS|EsEB>2Otmtf-18`jUGA6kMZL3vEASDN zNX%?0+=vgsUz!dxZ@~)eU17m4pN3xGC0T;#a@b9Iu0g_v*a3|ck^s_DVA^%yH-wt= zm1)7&q6&Rq#)nc9PQ6DKD{NU=&ul10rTiIe!)x^PS~=K(wX9|?k&{Mv&S$iL9@H7= zG0w~UxKXLF003zJ-H%fGA4Db9{~#p&Bl7ki^SWwv2sfoAlrLMvza)uh;7Aa_@FL4b z4G>`j5Mn9e5JrrN#R$wiB(!6@lU@49(tawM&oma6lB$-^!Pmmo;&j57CDmKi)yesg~P;lJPy9D(!;n;^1ql)$5uYf~f z&GywSWx=ABov_%8pCx=g-gww_u26?5st=rdeExu?5dvj^C?ZZxDv@Si^nX~2qA&K= z2jr;{=L(x~9GLXrIGXs>dehU^D}_NMCMegdtNVWyx)8xHT6Qu!R>?%@RvADs9er;NMkweUBFNrBm1F5e0_>^%CwM6ui}K_MpRqLS0*@lAcj zB6TTCBv>w2qh)qU3*kN+6tPmMQx|5Z0A4n67U-nss90Ec_rDF}r)IR4PE{$8;BSt= zT%6|jyD^(w6a*A5>_|TkMqx~e$n@8{`q?|)Q&Y4UWcI!yP-8AwBQ#P`%M&ib;}pli z9KAPU_9txQ3zOM#(x}*lN8q$2(Tq1yT4RN0!t~|&RdQMXfm!81d0ZuyD}aG3r4+g` z8Aevs3E_ssRAMR+&*Q30M!J5&o%^(3$ZJ=PLZ9<@x^0nb>dm17;8EQJE>hLgR(Wc% zn_LXw|5=b$6%X zS~ClDAZ?wdQrtKcV9>_v1_IXqy)?<@cGGq#!H`DNOE1hb4*P_@tGbMy6r@iCN=NiA zL1jLwuMw&N-e9H(v7>HGwqegSgD{GSzZ@sZ?g5Y`fuZ^X2hL=qeFO(;u|QZl1|HmW zYv+kq#fq_Kzr_LaezT zqIkG6R+ve#k6!xy*}@Kz@jcRaG9g|~j5fAYegGOE0k8+qtF?EgI99h*W}Cw z7TP&T0tz4QxiW!r zF4?|!WiNo=$ZCyrom-ep7y}(MVWOWxL+9?AlhX<>p||=VzvX`lUX(EdR^e5m%Rp_q zim6JL6{>S%OKoX(0FS>c1zY|;&!%i-sSE>ybYX3&^>zb`NPj7?N^ydh=s=0fpyyz% zraFILQ17_9<ettJJt~I+sl=&CPHwz zC9dEb#QFQcY?bk11Y=tEl{t+2IG`QFmYS>ECl;kv=N6&_xJLQt>}ZQiFSf+!D*4Ar zGJ~LFB7e_2AQaxg*h{$!eJ6=smO(d2ZNmwzcy3OG@)kNymCWS44|>fP^7QkJHkE9JmLryhcxFASKb4GYkJ|u^Fj=VdF0%6kgKllkt zC|_ov2R4cJ2QjjYjT6jE#J1J<xaNC>Xm;0SX<`LuW*}*{yQ3c9{Zl=<9NP z^2g5rAdO!-b4XfeBrXa4f{M0&VDrq+ps&2C8FYl@S59?edhp~7ee>GR$zQI4r8ONi zP^OA+8zrTAxOMx5ZBS03RS@J_V`3{QsOxznx6Yt*$IuEd3%R|Ki&zZkjNvrxlPD$m z%K+rwM!`E&Z46ogXCu!3 z8use`FJJ?g_xi?~?MxZYXEu=F=XTC8P3{W*CbG3Wk)^31nD~W>*cJ@W4xg%Qqo7rq z`pUu8wL!6Cm~@niI*YmQ+NbldAlQRh?L!)upVZ)|1{2;0gh38FD&8h#V{7tR&&J}I zX1?;dBqK}5XVyv;l(%?@IVMYj3lL4r)Wx9$<99}{B92UthUfHW3DvGth^Q0-=kcJ1 z!*I9xYAc$5N$~rXV>_VzPVv`6CeX(A_j3*ZkeB~lor#8O-k+0OOYzTkri@PVRRpOP zmBV|NKlJT?y4Q82er)@lK&P%CeLbRw8f+ZC9R)twg5ayJ-Va!hbpPlhs?>297lC8 zvD*WtsmSS{t{}hMPS;JjNf)`_WzqoEt~Pd0T;+_0g*?p=dEQ0#Aemzg_czxPUspzI z^H5oelpi$Z{#zG$emQJ#$q#|K%a0_x5`|;7XGMuQ7lQB9zsnh6b75B9@>ZatHR_6c z0(k}`kfHic{V|@;ghTu>UOZ_jFClp>UT#piDniL(5ZNYXWeW0VRfBerxamg4su5<; z(}Ct2AhR@I-ro0}DdZLRtgI@dm+V`cRZjgV-H+aXm5|Mgz`aZX63i<|oHk-E)cABn z0$NR?(>fla7)Ong28FZSi9Yk0LtYl5lZw5wT!K5=fYT$avgkMKJWx~V#i@7~6_{dM zxDDPIW2l{O2Elv#i^cjYg~lGHRj(W*9gD`(FILKY$R`tL2qo&rtU*c;li!V`O$aV{ z!m|n!FAB2>MR_FVN*Ktv5+2dW4rr3YmfEheyD+48%USM#q6)w%#2}~=5yZE1LLcth zF%VtefH&#AcMx7)JNC$P>~OFuG6sK}F7V$D7m!{ixz&inpAVpFXiu^QruAw@Sc7Y2 z_A^V(2W_+KTGRp2aQSMAgyV#b3@{?5q@hPEP6oF3^}|@8GuD6iKbX;!LI!L=P#Za zL$Zuv#=x3fseRMZ()#SQcXv->xW`C|6quwqL1M&KByBj z2V`}(uL4JB-hUs6304@%QL~S6VF^6ZI=e-Nm9Tc^7gWLd*HM-^S&0d1NuObw-Y3e> zqSXR3>u^~aDQx>tHzn9x?XRk}+__h_LvS~3Fa`#+m*MB9qG(g(GY-^;wO|i#x^?CR zVsOitW{)5m7YV{kb&Z!eXmI}pxP_^kI{}#_ zgjaG)(y7RO*u`io)9E{kXo@kDHrbP;mO`v2Hei32u~HxyuS)acL!R(MUiOKsKCRtv z#H4&dEtrDz|MLy<&(dV!`Pr-J2RVuX1OUME@1%*GzLOchqoc94!9QF$QnrTrRzl`K zYz}h+XD4&p|5Pg33fh+ch;6#w*H5`@6xA;;S5)H>i$}ii2d*l_1qHxY`L3g=t? z!-H0J5>kDt$4DQ{@V3$htxCI;N+$d^K^ad8q~&)NCV6wa5(D${P!Y2w(XF!8d0GpJ zRa=xLRQ;=8`J2+A334};LOIhU`HQ*0v4Upn?w|sciL|{AJSrG_(%-(W9EZb%>EAGG zpDY?z1rQLps`nbCtzqJ#@wxU4}(j!ZQ{`g`g*SXlLah*W9 zyuh)UWoRCknQtd~Lk#BT_qjwj&Kw8U)w=owaJ;A5ae}3)y>{neYNS`|VHJdcSEBF# zBJ6a;T)u;^i#L~LVF-X7!E$SggILXMlsEy~v}K*DM2)f@U~g|Q6I-Pss@)`>fgFWx zsq&7pe!|VA-h;@=fBF{(mR1^{1>ukTYUdyF^#A+(|I_&nm{_xaKn3h4&yMyym2k-wMFg(s@ez=DPmuB%`| z6;e@HQKB(|!PU1sW)W6~x|=8m6rL~4dQ9LTk|RzL-_(_77B4I~ZG=q7K%qHiv!FD8 zmt;Vnhb{ymaydv2V;X-5p zTt2ln?kaB9&(dH_X70^@rrCfz)nwfa9LYTHXO(IPcTEf$QiEhTpl??L+`Eetyqof8 zzl=q)?KdYni!C_9b8Z3xm7r5<5ZG-0uA`u^7Dm7k4mAsQ(rkoWy*^DZJa~#y6+hNG zh?7{D9$a9LS`a@SvZ5?C{JUHovWU9KI}z8YV4pWftx21v*Q;MpU{+b@>Or(}pwO^fu0qA3_k_Bo2}lIxvmMhucG-o>O=+R6YxZ zjs!o%K1AA*q#&bs@~%YA@C;}?!7yIml1`%lT3Cvq4)%A)U0o1)7HM;mm4-ZZK2`Lj zLo?!Kq1G1y1lk>$U~_tOW=%XFoyIui^Cdk511&V}x#n4JeB7>bpQkYIkpGQRHxH$L z%tS=WHC~upIXSem>=TTv?BLsQ37AO88(X+L1bI<;Bt>eY!}wjYoBn#2RGEP49&ZH-Z_}R_JK_ z>o*_y!pOI6?Vf*{x-XT;^(_0}2twfk`*)_lLl0H-g|}BC?dm7CU|^-gNJ~rx z($>97WTKf71$?2|V$Ybpf~Aj@ZZOcb3#uRq51%4^ts-#RMrJhgm|K3QpCsPGW=2dZ zAr5-HYX!D*o#Q&2;jL%X?0{}yH}j*(JC4ck;u%=a_D6CrXyBIM&O#7QWgc?@7MCsY zfH6&xgQmG$U6Miu$iF(*6d8Mq3Z+en_Fi`6VFF=i6L8+;Hr6J zmT=k0A2T{9Ghh9@)|G5R-<3A|qe_a#ipsFs6Yd!}Lcdl8k)I22-)F^4O&GP&1ljl~ z!REpRoer@}YTSWM&mueNci|^H?GbJcfC_Y@?Y+e4Yw?Qoy@VLy_8u2d#0W~C6j(pe zyO6SqpGhB-;)%3lwMGseMkWH0EgErnd9a_pLaxbWJug8$meJoY@o-5kNv&A$MJZ=U z^fXPLqV6m3#x%4V*OYD zUPS&WHikdN<{#Yj|EFQ`UojD4`Zh*CZO4Cv`w^&*FfqBi`iXsWg%%a< zk@*c%j1+xib(4q^nHHO^y5d8iNkvczbqZ5;^ZVu%*PJ!O?X-CoNP*&tOU!5%bwUEw zQN?P*a=KKlu{`7GoA}DE=#nDibRgecw>-*da~7&wgow}|DyCJq!-Lp8a~(zR@tO1 zgu(4s4HptPGn(HmN2ayYs@g+yx1n`nU3KM{tQHhMHBw7f#gwru$=C()`aKZAl^dYc ze7fC)8EZEXOryk6AD&-4L+4cJ&M@3;;{R)mi4=`ti7IZByr^|_HNsjcNFu?mIE)jD za2j)FPwRY!R_YR-P?URm0Pti*e#5jmfK)6EvaKCT{h)kbJl{AGr1Ekt}pG?^e z*botRf-RsB8q10BTroj{ZP**)2zkXTF+{9<4@$aNDreO7%tttKkR3z`3ljd?heAJEe<0%4zYK?};Ur*!a>PbGYFFi(OF-%wyzbKeBdbkjv^i9mn@UocSS z4;J%-Q$l`zb&r*Pb`U;3@qkc=8QaPE9KwmlVwAf01sa*uI2*N`9U^3*1lLsM9dJ(4 zZBkU}os|5YT#Z;PD8xVv!yo$-n{-n4JM5ukjnTciniiT`(cZ6sD6~67e5_?8am%!w zeCLUxq~7x-!Xg#PgKV&caC@7mu<86am{WaXo(lAemt4~I$utSp(URWpYNo$RvU*$N z#%iiA+h`(E;BUg;=I!#EaxO89bUK3*v5Nc3GPmURC5TqzC|))DsFNtJICH6oBW6#q z+B(N{ey+^mk_{!@ z)VhAWXG=_0j|0f9iJ;c404PiIFqK)(AD05Xh`Fk`r$^b`v+>*g+_+h@r)e+ELJ45) z?20~u<}HQyQ5AsBz(teF9!!_GLXnm{5Z0e{Ki*@!=&3x4-RcjBn##DDzHJ|KSZ5(E z9=tFZ)p~-}x%9sCY27)2i>(E-^OiYT?_)a;yXAGR$y+E`myMd;xDA#_Q49t*E}&ql#H~|x z2J2R1_#2lt91NnF!uqW%_=HlbF?A{B{n>}9$g5QF!bh_a7LTU~Jyz}7>W5{_LAov{ zy2_dmGy)d)&7^bJyUjEw%3xj{cuG0Eo zwL*XQB*Oi=r&HIIecC1%lbE;Y-*5|cL955S+2@uR18JDL<0;;Uc2Q9JEyo1R!!sz_ z#BqnkGfbLP#oQJk3y}nwMd(3Tt^PVA#zXnYF7D0W1)#+`i?@cm}fBkKD z+Mpcuim53|v7;8Tv(KraEyOK`HvJq^;rlNzOjIbW&HJDFqW>doN&j7)`RDv#v|PQ+ z03WnB4Y4X@Fe-@%3;He*FjY1MFmkyv0>64Cp~FIDKQTwmFP~_CxZOf{8gPy}I<=JC zo%_bmue&$UU0|GG%%99eI!m#5Y1MD3AsJqG#gt3u{%sj5&tQ&xZpP%fcKdYPtr<3$ zAeqgZ=vdjA;Xi##r%!J+yhK)TDP3%C7Y#J|&N^))dRk&qJSU*b;1W%t1;j#2{l~#{ zo8QYEny2AY>N{z4S6|uBzYp>7nP_tqX#!DfgQfeY6CO7ZRJ10&$5Rc+BEPb{ns!Bi z`y;v{>LQheel`}&OniUiNtQv@;EQP5iR&MitbPCYvoZgL76Tqu#lruAI`#g9F#j!= z^FLRVg0?m$=BCaL`u{ZnNKV>N`O$SuDvY`AoyfIzL9~ zo|bs1ADoXMr{tRGL% zA#cLu%kuMrYQXJq8(&qS|UYUxdCla(;SJLYIdQp)1luCxniVg~duy zUTPo9%ev2~W}Vbm-*=!DKv$%TktO$2rF~7-W-{ODp{sL%yQY_tcupR@HlA0f#^1l8 zbi>MV~o zz)zl1a?sGv)E}kP$4v3CQgTjpSJo?s>_$e>s2i+M^D5EfrwjFAo(8E%(^ROV0vz0o z-cg0jIk24n!wxZainfH)+?MGu@kg$XgaMY-^H}z^vG~XC7z2;p2Kv`b^3S#b5ssMOJ7724v>S36dD zeypxJ<=E~sD4f5wX060RIF-AR0#{Z z=&y$r8A-e6q18lIF{@O9Mi%dYSYT6erw!@zrl=uj>o(3=M*Bg4E$#bLhNUPO+Mn}>+IVN-`>5gM7tT7jre|&*_t;Tpk%PJL z%$qScr*q7OJ6?p&;VjEZ&*A;wHv2GdJ+fE;d(Qj#pmf2WL5#s^ZrXYC8x7)>5vq_7 zMCL}T{jNMA5`}6P5#PaMJDB2~TVt;!yEP)WEDAoi9PUt89S2Cj?+E0V(=_sv4Vn6b z_kS6~X!G;PKK>vZF@gWpg8Zuh%YX^2UYPdCg7?EH#^gkdOWpy(%RnXyyrhmJT~UJw zAR;%Zgb6z(mS+o9MT|Sc6O({!i0pzk;s9?Dq)%tTW3*XdM3zhPn*`z45$Bg!P4xfy zD*{>30*JsSk?bQ-DgG62v>Vw-w`SA}{*Za7%N(d-mr@~xq5&OvPa*F2Q3Mqzzf%Oe z4N$`+<=;f5_$9nBd=PhPRU>9_2N8M`tT<-fcvc&!qkoAo4J{e3&;6(YoF8Wd&A+>; z|MSKXb~83~{=byCWHm57tRs{!AI<5papN(zKssb_p_WT@0kL0T0Z5#KLbz%zfk?f7 zR!vXBs36XaNcq5usS7<>skM_*P$e*^8y1ksiuokbsGFQ_{-8BAMfu!Z6G=88;>Fxt z|F-RU{=9i6obkTa0k~L#g;9ot8GCSxjAsyeN~1;^E=o5`m%u7dO1C*nn1gklHCBUw z;R(LgZ}sHld`c%&=S+Vx%;_I1*36P`WYx%&AboA1W@P;BvuFW+ng*wh?^aH4-b7So zG?9kFs_6ma85@wo!Z`L)B#zQAZz{Mc7S%d<*_4cKYaKRSY`#<{w?}4*Z>f2gvK`P1 zfT~v?LkvzaxnV|3^^P5UZa1I@u*4>TdXADYkent$d1q;jzE~%v?@rFYC~jB;IM5n_U0;r>5Xmdu{;2%zCwa&n>vnRC^&+dUZKy zt=@Lfsb$dsMP}Bn;3sb+u76jBKX(|0P-^P!&CUJ!;M?R?z7)$0DXkMG*ccBLj+xI) zYP=jIl88MY5Jyf@wKN--x@We~_^#kM2#Xg$0yD+2Tu^MZ1w%AIpCToT-qQbctHpc_ z>Z97ECB%ak;R<4hEt6bVqgYm(!~^Yx9?6_FUDqQQVk=HETyWpi!O^`EZ_5AoSv@VbUzsqusIZ;yX!4CsMiznO}S{4e>^0`c<)c~mC#*{90@+T@%EQ~>bovc8n_$bvqkOU7CrYe8uI5~{3O7EijeX`js z-$LNz4pJA7_V5~JA_Wl*uSrQYSh9Wm($%@jowv^fSPW<~kK&M*hAleywHd?7v{`;Y zBhL2+-O+7QK_)7XOJAbdTV-S`!I)t~GE8z+fV7y;wp#!wj75drv;R*UdSh(}u$%{VSd0gLeFp;h6FkiVz%g=EY3G#>RU;alRy;vQmk*| z@x-ba0XKE%IyL4OYw6IXzMiS(q^UDk=t(#XgkuF`{P?=k8k3r)rmhkv`vg@kiWd34 z-~t+1aV3SabTbG=nQYs>3~E<}{5@0g**LAWi*~SfRZhGcgP{e5T!0M7CU}`f@r8xI z0bx%sI!?5);-wG+Mx&S=NRfIi>V-wP(n&$X0Bhd)qI^ch%96s6&u7qpiK8ijA=X_R zk&|9f$GXf-;VgnrxV83Cp-Q!!sHH`5O^o~qZu!xny1t?(Au(EAn)D??v<1Uo;#m7-M@ovk|()C(`o>QMTp}F?> zakm3bHBKUjH-MHXDow7#Z|@wea1X9ePH;%YA)fCZ9-MD)p^(p!2E`aU9nmJlm;CXQ zkx~$WQ`Yq{1h5k>E>Ex{Z=P=)N*0b8_O({IeKg?vqQ)hk=JHe z5iqUKm!~mLP0fnRwkCO(xxTV@&p+o8wdSP$jZofYP}yEkvSc z5yD-^>04{zTP7X44q9Af&-wgt7k|XtncO&L@y-wFFR44RsPu57FRvIBaI^Pqy_*DV z@i13CsaR5@X@xH=NT3}T`_vsy!a02n80eQqya=-p7#YW`Jc0z!QglGg`1zeg6uXwI zsB~hlNMo)kFL(V3Q1<%8yoI6X7ncn-&&Uh3rL@S(6@wKAXt6Wr=a2ObI7}8$D-FoI z>AJA>WsBEMi5ba6JhJ%9EAi&ocd(ZsD|MsXwu@X;2h#|(bSWu@2{+c7soC`%uo{sMYq&Vyufb)?OI59ds)O+kyE8@G z@tlpNr0UO~}qd0HQve6njJ zda2+l$gdX7AvvGhxM6OToCuQ|Zw|9!g1)O+7>~{KNvASjp9#Cqce-or+y5xdzWL3gLWt2oa+T(I+{j(&bF1laUsJB{fOgE-B}qslaS>C z)TjzG8XecbS%a+?yT!0QmTex?E478;D|sL*oS4C-g0Tq(YoH|eyxJ#1j088C|U-w5id`%Sz7X_w#l+U9+)$|2no<}5J zRb_9@0esSr?n}HvVGbD5@$p$8k4?qOe-GNOk3-K^Mw>Xg+drCKi5@$GTeijpI;;IG ziD<&go`ptLC&^<0jw^l0aY?_pUUK+xp#0Bk66iQ29vpR)VBE{JOJ&OL^gKsN<&t<| zCMLTYMSDG5Ie9O>6Dl#T{@cscz%)}?tC#?rj>iwQ0!YUk~R z$rB-k=fa9x&631Z9Mfqj_GRoS1MzqSMEdaZ2!isP19Sr>qG8!yL(WWF)_&{F)r>KnJGSciSp!P0fqHr+G=fGO02Q#9gHK zpwz+yhpC4w*<9JO@#(MdkZcWbdCO5B!H`Z|nV?UtcBo96$BgX+7VYMwp@b-%;BrJu zMd*K!{1txv{kHKPDs9?WZrz_^o1Tq2P=+=|E=Oy4#WE{>9}*9(apqhmE`&AeBzQgQ zELFLCmb~q|6y0FCt|B}*uI*ayZ#6=$BpGtF{Jfye#Q>FZ?BPnk)*Qmd?rNG^tvFUU z_b&antYsZnUR6Q9tQUy81r$&ovT#fy;(Db4F&M*C=KxQgHDrRcVR#d+ z0(D|*9#u`w_%2o3faI{?dNd9$#5nj1PROHNq z7HJ(;7B1ThyM>a@Fo^lJb2ls2lD`}ocREH|5pKN;$>gFyM6k)kZG;lA;@kSJIqUhf zX%dhcN(Jtomz4(rNng&1br3Xx33EvCWz%o8s;SpRiKEUFd+KJ+u|gn|J85dZ)Exc&=V|Ns8Xs#P>qv6PX&VAJXJ(ILZO!WJd0 z`+|f5HrEj~isRN7?dBHotcPI7;6W48*%J(9 zftl1Tr`bKH*WNdFx+h;BZ+`p!qKl~|Zt5izh}#pU9FQKE97#$@*pf38Hr8A+`N+50U3$6h%^!4fBN zjh^cl#8qW5OZbvxCfYzKHuyeKLF4z^@~+oqlz9(Hx8vypIiUlt!(vs}_t#4@nh$s; z>FYERg*KD#Xs+W4q-V-IBQK!)M1)Aa+h+V+is)z!_=gEn&^ci7<DEEmYcoSh?WdXUsP7O4)&lQXA(BVM5jI8s6;mO}94AC0gG(`>|T)yuV1l~i-ejCCt zoejDhX0nrZDP|x9u4zp%S2UeDzV`o#pBGu1tZ-$<9TIbN=ALwhQ0=9S{8#}Uu8n-~ z5~xIvUhLSz@c@0|me$CdZCpZl(vQw@a0Y4^{T0w_>pOkwI^x4KkBf3qGmm)nG|Ps5 z_XTY~^b^mL&_*yjl~RRIi&eS(>y?y}O4-)nWyTEPpQAb#Xz8SnnfIL+nAcNL9nqV9 zRL|eyF)RKI5-kJO6}>Q89XmgY@b1&!JI>g3ryZ@jN2v3vm7O`AL!BTWNouJzV+$+Y zYY}u%i>K6=IYU2O$2TAyVjGt?wgF9xCj;?EK(8fWu!!~48`3u^W$eUlCh*91PLxu1 zRY(F7Q3s7h$Q-p&L$ucN}it*-9KR z_<wHu?!dav0$P+PI3{J8?{+l|n&2YMLV2 z+hRta$A5WpCXl1RNbYBsX8IGX{2v>U|8_I-JD56K|GexW>}F_e_g_1r?08v8Kz{V$ zT=6aGMk>ibvRO@Yrc@ezaD0%ydHkXGHrR{7>q~~tO7ChJflwa4-xL|@#YIJejC5VT zInU4CjQ9V0+lClQY=vh^s4MadwQmk7li{54Y;Ht}gkZOIh9(vfK?3kXLoD72!lHD# zwI-Jg|IhT=Y#s|tso1PWp;|aJ2}M?Y{ETyYG<86woO_b+WVRh<9eJu#i5jxKu(s~3 z4mz+@3=aNl^xt{E2_xewFIsHJfCzEkqQ0<7e|{vT>{;WlICA|DW4c@^A*osWudRAP zJut4A^wh@}XW4*&iFq|rOUqg*x%1F+hu3U6Am;CLXMF&({;q0uEWG2w2lZtg)prt` z=5@!oRH~lpncz1yO4+)?>NkO4NEgP4U~VPmfw~CEWo`!#AeTySp3qOE#{oUW>FwHkZ3rBaFeISHfiVSB7%}M) z=10EZ1Ec&l;4 zG98m5sU!pVqojGEFh8P{2|!ReQ&hfDEH2dmTVkrS;$dN~G2v-qnxn^A2VeHqY@;P} zudZD5vHtVvB*loIDF1M7AEEvS&h0;X`u}!1vj6S-NmdbeL=r{*T2J6^VA7F`S`CDd zY|=AA6|9Tu8>ND6fQhfK4;L3vAdJPBA}d6YOyKP&ZVi%z6{lbkE|VyB*p1_julR^k zqBwjkqmFK=u&e8MfArjW-(Ei8{rWso1vt5NhUdN|zpXqK{ylJ8@}wq-nV~L4bIjtt zt$&(1FTIs+aw}{&0SO4*sa0H2h&7g}VN5uYjfed5h7eGp$2Wu*@m9WIr0kxOc}fX9eOWh zFKfV>+SD$@kESKYm{F*J90XQjr$!<~v(J%&RMuQM+6CkmnYZDGlOUdq}%)VA& zl#acS%XE2KuX~7IamK`og@C`21~*cEEc#PZM6HT*Veb_l&Ej~j0zL7p0Eo`mMu(=X zJ$v;&Lya75I4C^saKROgfi(fdP0C$GM3WyZn%mm3yEI>|S&O(u{{S<}ihUp#`X&_z zmQBma;82#`C;dR5Sx09e07FvtJLhZ{9R~|$FCdU6TDNUwTc9kNct?8e@o2MpQDrkg zN?G+aYtTjiUPA=RX5o{4RYu}6;)ET>TcgL^VpfIpluJ|lQR(_)>6k%L^FZmoK-Wm- zR5qy0P)hm8yvqOL>>Z;k4U}!s?%1~7v7K~m+gh=0c9Ip_9UC3nwr$%^I>yU6`;2kV z-uJ%y-afzA7;BC7jc-=XnpHK+Kf*tcOS>f5ab2&J&5hIOfXzs=&cz|Qmrpu6Z);`R z0%3^dioK5x?o7t~SK7u5m{dyUZ#QUPqBHYn@jETeG>VU=ieZuJ;mm^j>dZM7))cw?a`w8R z%3M0R=kdOt^W^$Kq5Z%aJ(a$(*qFpy^W}Ij$h+Jnmc9eaP(vB@{@8t zz=RQ$x4XYC#enS$fxh@;cSZ|D%7ug;0z{C8I8h{KocN-cyv3UG_nk99UNS4ki^OFkYea`q`rs zG@qdMI;4ogcd5Tr`di1JBg4I*6CFvCID_2SN5&)DZG&wXW{|c+BdQ4)G9_{YGA@A* zaf}o^hQFJCFtzt&*ua~%3NylCjLtqWTfmA-@zw;@*?d&RE3O8G&d;AVC|rZrU}jx# zC-9SF`9;CbQ(?07o8Q9E12vi)EP@tOIYKEKnO@-o!ggkC)^#L-c40iZtb4Y-cS>$I zTn~+>rn*Ts>*y*z^b3-fAlne+M-*%ecrI^rmKAVv23cB`aWD?JDJ5NIafRvRr*~~C z)99Afs`BPK!5BFT)b_^8GyH*{22}yDq;be`GnPl=vW+ITnaqzl(uYOHhXi}S!P+QZ z4SwfEPuu&z4t#?6Zaw}bvN{;|80DfxCTuOdz-}iY%AO}SBj1nx1(*F%3A-zdxU0aj z`zzw9-l?C(2H7rtBA*_)*rea>G?SnBgv#L)17oe57KFyDgzE36&tlDunHKKW$?}ta ztJc>6h<^^#x1@iTYrc}__pe0yf1OnQmoTjWaCG`#Cbdb?g5kXaXd-7;tfx?>Y-gI| zt7_K}yT5WM-2?bD-}ym*?~sZ{FgkQ9tXFSF zls=QGy?fZ=+(@M>P3Y>@O{f44yU^fP>zNzIQ0(&O$JCd_!p?2;} zI6E1j@`DxzgJvqcE@zgapQ?tophO14`=14DUZ*#@%rRi``pi0lkNgidSsHGjXK8gO{drQoNqR&tRjM4>^DtW`)fiRFO4LE=Z+nCBS~|B3gZsh`Y?-$g z@8@Z$D7C!L9l=SWoE;(+*YirPLWvBd$5Ztn3J3EaGM+#pW#@{3%yksGqy(2Bt5PVE zf*fICtPp77%}5j#0G8<=v=)LR>-a3dxja8cy3m$=MZ2#$8mbLvxE%NptMd+L?mG`v zF1cANFv17DqP^P5)AYHDQWHk*s~HFq6OaJ3h#BUqUOMkh)~!(ptZ2WP!_$TBV}!@>Ta#eQS_{ffgpfiRbyw1f)X4S z_iU`lNuTy86;%!sF3yh?$5zjW4F?6E9Ts-TnA zDyx5p1h$Z3IsHv7b*Q{5(bkPc{f`2Wfxg*Z#IvQ;W_q9|GqXGj<@abo)FyPtzI~i25&o zC!cJR%0!}lLf^L2eAfZg7Z69wp{J?D6UhXr%vvAn?%)7Ngct4Hrs@LZqD9qFHYAWy z4l=2LI?ER&$He2n`RiG&nsfLv?8$Cl)&d8a-~-N`I|&EPa@Y=v@>0Gl?jlt>AUY;H z`**5bpS#VGhdp4pKbf3iEF*>-eXg_$bqt5Dc%q0+)R50>zd^l7sN5R5Z)Ut+oz-8_ zJ`Z9HE9(=wRTD)T=%GZTEi9K5naPzlfE$|3GYGLRCLsnqLi8Sc6y&iskqA&Z$#7Ng z7Q@C0)6k;J$TlQ+VKZ5)-Ff_BNoIMm+~!@Cv1yAUI-U!R)LHc@+nSUzo$GlRb+8W< zYPG%NFfr;!(RlnvBbN~~EpT6Xj5*^Z&73tdIQ$LZu`vkfzdTKa5|JJtQ_rm4g$9LO zKtgYVdW=b<2WGM3I_j|Rd8gZ3j;)S#AT(aP^d>9wrtQS_+K>pZDX^?mN!Z>f^jP@1 zlJ;i79_MgOAJa`%S9EdVn>ip{d!k6c5%zizdIoB9Nr!n`*X#%6xP1?vHKc6*6+vKx zmEt|f^02)S_u_wlW_<`7uLQU%{wdH0iojOf_=}2=(krE<*!~kn%==#0Zz`?8v@4gP zPB=-O-W=OO3tD19%eX>PZj3YfrCt0sEjgTd#b$buAgBri#)wW14x7QcHf2Cneuizz z368r7`zpf`YltXY9|2V{stf8VCHgKXVGjv$m!hdDf0gi`(Q!(Pyg~FO28Vr#!BYP| zI)qG2?Ho=1Us9dTml}-ZOR?g5Vk)f+r=dbCN*N1=qNfG>UCLeA8pd3Ub-pRx1b3FA zEn`CIMf`2Mt3>>#3RkE19o}aMzi^C`+Z>8iIPHSdTdmjCdJBtNmd9o0^LrJc9|U9c zD~=FUnSyghk7jScMWT|SHkP(&DK$Z=n&lGm+FDTpGxfoIyKV)H6^nY~INQ#=OtIT! zyB*J=(#oHf=S)MNOncW->!c0r0H#=2QzobO&f@x&Y8sYi-)Ld;83zO$9@nPPhD}yt z{P`*fT@Z(?YAmF{1)C;o?G@dfd2$c+=Av*|;P@Yz1KnclB-Z-fJQ-=+T*g>0B7!g# zQH{dHt_%wj=wlmT&m59)TQ~xK)gB6f^EY$=1zcbGf~Q>p_PzDCHR6lndGmqPY2)&w z$Th^K%1v@KeY-5DpLr4zeJcHqB`HqX0A$e)AIm(Y(hNQk5uqovcuch0v=`DU5YC3y z-5i&?5@i$icVgS3@YrU<+aBw+WUaTr5Ya9$)S>!<@Q?5PsQIz560=q4wGE3Ycs*vK z8@ys>cpbG8Ff74#oVzfy)S@LK27V5-0h|;_~=j1TTZ9_1LrbBUHb?)F4fc)&F7hX1v160!vJc!aRI>vp*bYK=CB(Qbtw7 zDr2O^J%%#zHa7M5hGBh#8(2IBAk}zdhAk$`=QYe^0P6Bb+j5X)Grmi$ z6YH?*kx9hX>KCI04iaM_wzSVD+%EWS)@DR&nWsSBc2VIZ>C(jX((ZiV0=cp}rtTO&|GMvbmE4FpBF5Rd z6ZG=>X&>N3?ZN2^11pXEP4L?XUo`qrwxgQm4X~RCttXmZAhnhu4KDK=VkKq?@@Q_Z za`*xyHrsAEsR zV(7)2+|h)%EHHLD3>Qg{>G|ns_%5g5aSzA#z91R zMDKNuIt@|t?PkPsjCxUy&fu^At*yUYdBV!R_KOyVb?DO&z$GLJh9~b|3ELsysL7U6 zp24`RH+;%C(!bWHtX&*bF!l-jEXsR_|K~XL+9c+$`<11IzZ4>se?JZh1Ds60y#7sW zoh+O!Tuqd}w)1VxzL>W?;A=$xf1Os={m;|NbvBxm+JC@H^Fj$J=?t2XqL|2KWl$3+ zz$K+#_-KW(t)MEg6zBSF8XqU$IUhHj+&VwsZqd7) ztjz$#CZrccfmFdi_1$#&wl~A*RisBaBy~)w|txu1QrvR1?)2mb&m2N$C(5MS%hSX)VJnb@ZGXB5^%(<#1L@ zL^>fBd+dEe`&hxXM<0A9tviIs^BDkByJdc~mtTYr!%F7Q1XnK2$%h$Ob30*hSP$Bt zDd#w{2Z%x^Wpv8!)hm>6u01mY!xmPgwZ#Q0148)SxJc3Udt!-&}eRO^LN ze26pQB!Jhg&Z>#FD>`C`sU44><=v>O>tJdLs!HPpV#AM32^J@Za-9J(CQjKxpzXao zQfRkWP%g9P8XV21MmoHfx{DICLSc*t4qVeQL9t}&Pz0rM}YTba@XsD=XMW@FxFM{QYQJHvM(JsUSa3mcTUl9^qcVA zBveO--fqw%{#QGR1vy;x88+qMcgzmcYc#8U`CPPt6bl?uj%w_`b~9JliftnOa|ziW z|6(q&STs_*0{KNa(Z79@{`X&JY1^+;Xa69b|Dd7D&H!hVf6&hh4NZ5v0pt&DEsMpo zMr0ak4U%PP5+e(ja@sKj)2IONU+B`cVR&53WbXAm5=K>~>@0Qh7kK*=iU^KaC~-ir zYFQA7@!SSrZyYEp95i%GCj*1WgtDId*icG=rKu~O#ZtEB2^+&4+s_Tv1;2OIjh~pG zcfHczxNp>;OeocnVoL-HyKU!i!v0vWF_jJs&O1zm%4%40S7_FVNX1;R4h^c1u9V@f z`YzP6l>w>%a#*jk(Y82xQ@`@L(*zD&H>NY`iH(iyEU5R$qwTKC5jm4>BikQGHp^)u z-RQ`UCa70hJaYQeA=HtU1;fyxkcB2oY&q&->r-G9pis)t$`508$?eDDueFdW=n5hJ z08lH$dKN$y#OEE@k{#|<%GYY=_c~fHfC@pD54KSP9{Ek@T47ez$;m$}iwR}3?)hbkwS$@p2iVH0IM$lB*XYA+#}-re|UNzCE)SOYwy z=Y!fkG4&I%3J(_H#UsV#SjHulRIVcpJ`utDTY{k&6?#fzt~@Om=L(vs6cxAJxkIWI z@H7)f2h%9!jl@C!lm+X4uu;TT6o0pd7 zteFQ(ND@djf#o2kTkjcgT=dHs7ukmP0&l8{f;o3JuHGd2Op*?p7?Ct=jA*tIg{MZk z$2Lsc0e8Tdcwrjx|_Ok?9uB3Il|^2FF%X#ck}WoIvrzQXN%kT$9NI{79Wm~gZ3`8I+O`)`n30feZ( zDO-fl6IG3c^8S;Y_M-)+^CmM0tT^g0?H#>H8!oC8W%oU!~3|DJ?)~LT9*&GAQG13zOGq6gs*={cu|(V7{R$y@{-iV*9q@AD(#Ktb}J&3&k|5Djs$)9WM7!6#EaJ_ilvbfUvyh8c?-{n zfuFrC0u6}UJZ7aj@(cNG_(CKgjQQTA-UK@-MVmick zot}6F%@jhq(*}!rVFp5d6?dg|G}M*moyLriI!PQDI;E1L1eOa6>F9E6&mdLD>^0jJ z09l?1PptuV65gm=)VYiv<5?*<+MH~*G|$~9Z3XEy@B1-M(}o&*Fr9Sv6NYAP#`h{p zbwbUE3xeJ;vD}QMqECN)!yvDHRwb7c1s6IRmW!094`?Fm!l~45w)0X`Hg+6Y0-xf# zSMemBdE)Q=e^58HR{kWrL5-H0X6pDu%o{0=#!KxGp0A;6{N5kI+EoY_eTE%2q|rwm zekNeLY-R?htk!YP2|@dbd8TWG4#G)=bXlE{^ZTb^Q$}Er zz)Fp)ul24tBtQFIegdI37`K$VR3tVdi<(fIsu{#QMx=$&CK9M8oN%3Mk;>ZPd-;Q- zn|sSKSnc-S0yrw#TlA$+p{J~u=u98s>IoL@cNLOxH=+1m?;t1bR$vR=M$US&Z8DO3 z_&zhQuId1$wVNsS=X?&s(ecIi#00o{kuPs6kpYkL$jMyGW8U7mlCVaZeEL=HsIxqm zFRLxWin8B>!Dc#9Z#t0RNQiR-@5J+=;tC7|1D*~rxcwHa5iIVD@99cCFE@BukUC-S z^iJdt?dwU)kH2VY9?|zVShMbZctzFRz5Q4tiXa^>@U%jDYq}$rSyc#p2wXr}mc0qq z^lT>$y)N(Qg0dwmEwTopneoU(y)>Mj+f{iHM0o|>ZtCg-itPj4addYz??aE)Rp&hk z_SI)%XeSf=SjZq18h!Cc>Xy&EynnxdHQ){(x@g|ZA%`3LU^KzX02c5N;F#tEk1)7v z(|V9tO3>?^X|kQ*rRBf4>mWW2$-Lx})|M7z125&VHcxsCqB!<$l1F$zCrJ+nm0f3Z z%Hq^=SKpHyV2@Y*Cu2x>fXC0SscnR*($zEB{KOniJcpn@e`PMH*_Q6*0Z^8RNCEvZ z+UU9!927p9YZ&g=bnUvQUZcdisyn;-4;ACXOe-Xor9K8Qbp{ldE17+G@VQT+9ZJQ*9dZoXfU2ue|mMhrrZk2R7&~YjFW4`BTq45UwVc6JORKU)wBCTanITh0GD}s$`C5pb(9{b9 znwee6j%?-UV)_7opOioCf5@C?@w^@g& z&68+oMmV;5JW@TT63&CSDrfYL2$L)pVseDtAwPwleEM3F^-Ufn3PpfxFmx6o zQ`Wq9x#d$e`VKn5LOXNsrqhGao7~|s(u~drPrZ+;aP!C%z4NskZstCbAibD}O%8Ij zb~C(taxco~WzJLxhL1T}3ctXMbV6}_z=IZN9L0|SxLSe`$X`<)BhM`$1&&)e_}fCh z=idVL<+u6Vn{&ksP*ZLlMo$fC`dtzF_?~L?4Rril2G4%v5^7sUa^&8aMtMX&mtapl zD(dW|cisM3fqMaB`8?QbkyiUl2g>hMB5EoS&IB8TdoC~)b$nT=`%GgU`k-)+8}`)F*~I~DXMaTP%kZftx11~?iALs5J+&Rom#p%Y z>dH}-euH4u=_V3hc6^*2WMtL!9%yRTJ93p}@aV0zdY*?xchFI>m+UivV=;aMFp0P~ zwB8P)wvV6D-GL?6hJ#g7Hy7=2i^&Od#S=j!;Rc_yjO!*4aN7{vqzg2t-R|Dav%_NDk z`H_FVlSi==(~f-#65VmQ{EE92x<03lwo5p)s=ZJ^L7PlS>132Whr zR6v~t(#I+(`usYLCoO;Rt8j&b^5g_xgs*98Gp|N}b>-`HtVm)MscD)71y?(K6DRCZV26RsHPHKk)EKKZA%C99t3$t^B0-k5@?E>A-YMbFe?>ms?J?_guHHNU(;id*>xH zTrtam+Aq?n@-y@uY@A?hy?1qX^eLu_RaH4Ave?A8NapgQF=C%XI7wlcCf4<6BRo_% zBXxxc*A6-3CruF?3i8HOdbc%>N=-iiOF+9HX|ht6SCkz;A^am&qi_I&qk1B(x<=(m z>QG)nswCOLl_1{SZ@_eE#m^qb6#6DoMsB*)`17ui+XvF%(}|J4G$z2G*;E!1ERnAH z@q%=#uV6kBddqy4=g>!VTV)9*1=i{wJ}Ep!I*?)uJdA(LwE?(!?;}_u=^M2NShWC_ z*7l4aBJ=!QVU2-iehgb`$vOI8zkm{W%QO~?xOD;NgI;Iqa3#^$^U5D&McReLe&qs# zR<^@QpR4#W~Laz+QBsPt@3L#KF`Yr8}jgHe;5(cfpQ=;Zjtbt;c%y^#-m=hqOT z;KAYakW+$w0&F}>K10&SiPcD9SrDOuczj@U#W})5jGU-_htU`U6Q%wdy((%?J}y+$ z=$4jw1N nJo)qTxG{D(`3*#8tY|67hJRF;)r6F|#I`Ar6I0aafRa=kr-Z0I^}9xf^u;G5iEQCbpv3b#S#%H|HYHsQaHK$! zU#3Fpz8*^pK%RRmX<_09eIVziB0jOgPgFnI-*QcwEBtBiO#v!>{W1cLNXyw3D9M|A z*oGy(u8BkDA1c;MsXmpK^-~pl=We^RYnhZ4bz*)Q)C2G+E3tgx9PzU0T>c|1ilS!T zyE=bz`=wskDiOi!@!l?Y))#%{FM`}7r~X)i1)1*c6_2Q!_1{)fp%cS|YF+Q-CB%d< z=zYus`Vt@Mx*a7V)=mpLS$-5viaKgNB=+zN657qy0qR94!cTtX-Z%KBCg4OKw7b=t zr=`7q5Ox=lJ%!G5WIyNQC1xpqYU0{!I$hyrk!6%De$gp<_*Gc?ES(OwY8U^)Kjgc{ zSlhpXDb|;{+y9`u{EuMz54rlky2~p6xX2>MV6BZ&k`$q%q7v(xYps2wr9e8^4<;CB zc)eAT~B^rjzO6<4BDDH;il6 zFsM8jL+agQ;zazW(uiQjM%fPf2N~_p{cy29XP11_lQFpt`t#9nlk}>fv((FZt-dBa zuMIc4HmPHW04n0TTG9ug9;&OV9euL$Ib|+M7}}L~z4e%%%b|r~6OQj(S2d7XfYn#xp8;KQ55UYu#gY*De5j6Cc z#R%?rqwpy7I1(kpU7B*Pq=etXeYUn04jg%ZPjYqQNa$==yTG=6KX+=;i2Xg+kjV2T*Gc!(ef z`Q4fR*TA=M5-}z+s%YO+!K{k}S**ic&>o4_Tmv$EQTOp7F6TXPCj-UTXy?OQ=%*y62Qajk{rXbR%jMCOFMiVE3KekQa4xR}B%=iPtd8BXo~q$OX_ zSp910{Ew;m|GATsq_XiJ3w@s(jrj^NDtr(Dp!`Ve!Oq?|EJ9=vY2>IfrV{rT%(jiY zi}W@jA2iqd=?q>s;3%?@oi7~Ndo3Ge-2!zX58j(w&zVlPuXm3rcHb7O0RsM|!Ys(b zh(=*&Aywo3vuJoWZnU!u2_4bNkDTc&&bCYc%T zM~~xYxS#3KXFzQ@OXdc%9QDOxqiTd_> zT;(DX9{5dIuC4pO_xy+3{Ov)1I7j!Z)6&nHUvTRP>VU5dm#849icG)cvl0QOPkCIzG^lOp4#UcNr`VhBp(Ha%8@KPlvT*5u!v_$b#b~%sn3K{mu zaxeD%Q~{;Lw03ZAq(Pc-IVj>n*h3l2{sqioCMGatQY0kx zi`1(WWDQ=;gmLSGptEQ%UFC)th@|71<8eiRtX&Mx@#1q#nMF_BMfQdS>!!Qkx2o}= zuqRi?`UOX5P3fP%M+71Q$ctH4Av}bXED#fQ`KR4!b~60nsAv^*M7c-x`|~B}XIuq% zlqIJOf>WvlhQ@Uw$du|14)tZ?; zPNZ|xZSwp1y+d4sut8E4*l2JWR|~o0A9vD-?zC-w zDc@=wE1YKb*OMSi_Kx}&w;#h3>sHp|8^hnA3w?-WK)X?@Z2dgV7`9Cupf-B2RE4x^ zwlw+~!V9C^tyb`J;m2}ksD`w}G9`yu(^--{SQ+wt^Fu4Li~Fft!3QO`upSkAU?o;# z(1Q%GUVWbbkTK-M=T+ULkk3s6Dc9`G4CO6|=&-S&D+rbJQ$`Y-xL~ol;kc(l)VbU>{&>bV+*?ua;$bnDc29RW+Ig16)Vf6=L|fMR_P2b7>6}0 zdlB#-gj|j*C~M=F^2=K*k~=tl6YM3SXXi&K-`EvEXnWz&4D-^hQRBJI3gKKDj^6|> z*WhHSim1qAffNt60Mve9lfw^+&0bx-AM0%j>QP3%W=S@(l=(nrJ678mRQ(#+sI@d{ zdb#5fo#T;hK7xJ=M58wZf|?DHwD%!OZ3JrTGV5#{cfQwuiMvz%!CQ}CubJ7`z?@rSF<+KHNV2goc)a6hP0oHB@3LLKSH2w{um&J*z1Ka2 zLIR>lvOvh>Oxe%?3A@v<_T|}${zf_&@C~^FCo#jB(W9VLO?DX{)n(BQ0(V0`mI|9Y z#U3WwxixJkU_NTvA>5q(A@r2dnEXJp#6B=pww$XGU}~1~c``UKqQb=^*2P|4Dq*_! zhY^i61Sy%T5$Td0O6^C>h(xVvT!}Y##WeT8+s+Uuz=7)~V$>!zU;%d>H)rm*6^IrsCma%|cifwDLk_ z!^W2voQ)D;I$=v2E>iSaBw!d7aD+|LWl2iD!cBw`Q5p1~fk_xGiPi8e^mY&#viTAk zmaKL8m;JQ4bY(n6uBZt02z#noMMxTfF-RzjKre-c+@B)#J3pN-Zv7F}JtAwNk3j?OkpVCL6W1)Q$FLAj zGI!tX;g`O{%pt=0|q54Jyj##w*4e*|_;Us2Tn?!#^R(>u}|FAw1G_ z#wQsagnj9$TAC`2B_XgB$wNq~Sxgl?#0+QWWcB{G`c6~&SosbtRt}Tukw`TQ!oG1= zYyL(y<;Wh+H24>=E}Gs=Hs2%fg;&Qdvr74{E!R?Bd zIRQ?{{xkLJ_44P@y3^#(Be%(pk%$liKbUUo76wSoVfJmt9iTKL3z{uW6L&?jYg>EY zsx{kRiW@q%<$VZvbS(TKKTO4{Ad6l^IeY(F^3}=mX9|FZmQ`~RErNxlBPl3ast}W$T4V?SW=6kIGn@-^`qJv| zZXwhK4Kl1a4E}nLI`rdOi?^pd6;LZ-|8G&INHgOeC5q{_#s+SXb0r(;5ryHFsoTJD zx$VtNDh=-Tx3t!NTlk=hgAaSM)#U}e>_-Ex(|JoX*hWmBPPdTIa-2(BIOUJ|Iddy| zwY*J%z%W$}*;uSoB!BIJB6N6UhQUIQE_yz_qzI>J^KBi}BY>=s6i!&Tc@qiz!=i?7 zxiX$U`wY+pL|g$eMs`>($`tgd_(wYg79#sL4Fo+aAXig?OQz2#X0Qak(8U8^&8==C z#-0^IygzQfJG4SWwS5vko2aaOJn*kM+f1-)aG{T43VJAgxdP(fJ4&U{XR90*#a)G8+clOwdF?hJ?D) zmxu>0>M|g_QRHe_7G|q6o`C>9x4xd$Gl7lAuR~+FtNid=%DRsnf}YI*yOToWO%xnP zY*1G5yDnTGv{{xg5FhWU65q3-|-(+-rJ2WCeSJn(7Az>ej4Jp9+l-GyZ_| zJ8}>iA4g|}q1AhEEv#uWR&$g&Uyht?fVU(qk(j?^D`))s>oG08pow!f>P1u71P%oL2)UC4GeS87&G?{)NE;D=my1Q9{~;y zJULE=bG6jXE28Y11YmoZoo945`MM*`v%5b=_02*0cwzDve#3(4M}NPt`)?SCa|7*q z-94ks(R6WH-l9fE4m4}10WSu&O`|;ZCIT%vL$_pbABY!}s33@~gIvZ0H4co|=_-T$ zF#lC7r`89_+RL9wYN=E3YwR?2{$^ki(KKd>smX(Wh*^VmQh|Ob5$n_%N{!{9xP~LJO0^=V?BK8AbCEFBhDd$^yih$>U z(o{RReCU{#zHSEavFNdc8Yt<%N9pd1flD{ZVSWQu*ea1t#$J5f6*6;tCx=&;EIN^S}*3s%=M#)`~=nz!&Q0&{EP|9nzWyS<#!QxP;!E8&3D}?QKh^ zqGum|+;xu9QE=F#fe2ws5+y1Igr&l`fLyLKry=1}(W+2W`waeOR`ZXlW1B{|;4sE3 zn^ZVlR11hiV~p<~TaSen8I~ay#7Ql=-_|U@$8yjZsZ=Vi+^`JV2+kn+oiSUi%omO_+7}saXnJ9 z5ETilbag(g#jZPopCgJu+n@(i7g}3EK2@N zd64$77H5a`i%b%a^iRjMaprwzWz(`=7E6QY)o)gek7H)yZ-BLw^6FAoHwTj9nJtWc ztKaytMlWGLg29W{?gr|rx&snb@XyvR_}x3fmC>d=-nQp5ab3*whTw}DfUcKlMDDx` z-%?ek^*|Kqooy#>2lfklZ|jN4X$&n6f)RNNPl(+0S>t(8xSeOGj~X0CGRrWmm(WXT z))DDW_t&y$D#2`9<-+JT0x1==26*gpWPV~IF=rePVF%e-I&y$@5eo~A+>yZ&z6&7> z*INESfBHGNegTWga&d@;n;FSCGyW?}e_Qw#GTLHo*fWxuuG@I~5VA!A1pOdRTiPA~ z^AGe(yo=9bwLJD}@oDf$d+34~=(vIuPtOKiP}obDc|?@hY}J*@V|UynBeAkYa?S{@ z_f$U=K+>deTAi&=a*xv>Ruyw$UsTWY=Yn=xjf;s)6NQu>_niQ_idmzIwuL`Scf)f= zyzK?D5a5)^D@H&qN%F6Zd0JeXX*Knbe~VLe^gi|?JK67&mB4jrapV-$`hCQT;C{%T z*pjxB+Y|~LD9bmMN%Iq}S$F$x1yWU7@GcR91V8h;!O2I5MN_rq*gRx(k8T!1WSDTp zr9eJO4$~H94aG^6k5p8k=kFJ>4lnY0q_Bsa$@vTRW6uY?slH|Qt)Yu6Yun&pfJ zBi!h;6x?FDs&79#PT*HSCEUsKws#s%TFy*=2PAfb`>gEPBn+D-WdfXA?MkB=<8kb_ z1+4D11mdHG0EcAyg4dneLtfJ8)RyHQl@6hWJNe(d_EjyCHf7%Xsd)S4A-4COz{G@% z5xQ!P>AS@H@;4Ws)N91)3A6PleMe2<& z!(zv#%Uc?N`(Xmm)OJPYt)BM`nRjoWA&P0Yxl@c9Y02zlPH1J5l$nhPrMwu=atkz4 z)a-1+OEL;d@ctx=s<<+3Sv1VYy0RYmiji|#hy$66#`5;u~BkH4^$EGZ-Y4xyZ=%3KuaeLYKAUr$xMtIh_5mga> zPz<#G0mQ7IxEw-yO}BueN}RaFlg$RwCDB)vLF$wDu%qZyLYsPKdcbHD23$qn9i#JFqIo#OK?u7db2-$GatzO!On87%}Br};~#}n zziVB;qf_4(K$u>Qyz$ln_kBGS!CD-t4Y}9oxL@7@Sx*?NOAzdeINUD>Hl#*V%pfA; zSA`==YatS*G*crJ3`3ll4)vKss&)UtY#7ZxiVoG%9(4<%`WWcjX2jV(^g7Yhj+h5J z$5=?S=tuCyEt74^6jo@6y|@~N>&cVfFNtaRl=)Gm!vR;Bc$3-;ySCI$%kdmjQ|si` z{$q_YCe6vjy6re9jGN|`43D``)1PODtz0)vhV4XV36nVpOnMx2uM%qZ<3TtcI%>BQ zf0(J`{JqPPJxw>k#&nIvoZ5e9Sno)B2r+E0G} z@&M|zf4E0Q$O*NBR2I;?i7N} z@2^Su#`%qeX}m3cbSojiLk#84kvW1fICNPS`OyT0SpUoA0(s^2m~J<^eKE!dhJx_N zG_T}0&(<*an>oF=@?6?55g&IxSgY3?7|@pmDRE6gJyJNPH6un~%0hZ@?h=hI6O$b^ z)29#<4$E)cE-5IFbRpk9JVrw$$966UDyw;Iym4OY4Fc!&s1ZH4BJ1-$9<)Zt1c)N- zU^&9hsk6z?3%<9kGKHW|6~k;&cghtWz`oz`_YjVuvy;B;T67=L2c6=8`7WyTBv*QH zNv*bo1#KOk{O&)@&pkd*?v+kcJ8tM>AGx$~WMhH{L40_N=bkrVg+^p!H)IqXCQf2_ z0fPig=8CEo>p4vE(nc^DKbZ|9_Xo}$i4zJ`jVh95; z5%aNP3@``=EJ=Vt9U`y+$YtX;%OPzgZ_3+;+mh{p#W&y4-%%Bf`LhOy-*kB0qnB^m z_nBTz_b?-`F$*ymByshU>D)za2g`0j^ioo;A#QeL@x3@|+_!=YXA5f6Xg(Ack&WOg zJ<2i|Fd6OmyH!@YSMVxb;=M)ZDhBt)4`5T*>cUXWPG#%@$&*>K&u3#|`fm2mj*FKVf?du{xZ}WKWETTFhq6_fO$PS5(ItF=3~pFp~*j z!ys1<4EL1)#{`mz@gW|t-FpPkd%pK)n_Rb)F;z7cQ6dym_>YI3&e!=!m006oS3Mjq{q ze%hNzW=G0jpfl2K(x`CDuZCsJV*hm9T~%5n7R_g}VFpk`G((D^MWVMAmRp--T{`P; zwMgD<;e`fm`g3|fPns|6qnd{|FCHY*YAguXH(?%sx%4+Gu|Y)_8mk4EljxmP+MP`* z`SUbI{TCIN2OV+$y#g->Jqv#$wL;}4xJmah#$0`v^ughM_XjTA$B}ux)JZuY5-GW4 zKy440I+w=ZtE-_i+0xImq}vyzD68?8;94-5L~_O6Ty>X3itdA-x?6P(c4jkr+f!H( zUDeqiG>3bn^Sf8(`_YwqPeJ9&-@OCQZm4X{FfRMeBtN4E9Ca@;GVpU*L>lVb;@=PH zTQvTr?^jKyCKh&ZVOI*<y%T*Aw(XCPrFC=39*y$A`FSzxBiQ#W+uW10d8&gYp4{teh;^p@anft+z$5!Hv&@h0X-@xJG>hbTCxjDwMiWK@1b%8wYL6BrV zT41m}tX8g-`P@vj4T!Mlk8F0S!MA`^J=SCy9-jdwDe^hVDa`WwyI^H@ryt=F5y6>b zT8&iI6&j8edAfX^ycgWbnMZQ26Q~`LmdEScKC8|~$Jgyw(>18NAQ$9AwCRmri!96L zp^)b0P2CR-9S%cG$#rU}MXnx21T#031o>2VrDs@sa-FpjfvgLPW>Q&LHUoNOtmkt# zoDZ=5OGp{^vO~=p29^`aXd8K?(+f-bW`N$U;-o;%f?RcR!k02Nod2h^^8ly%Z67#E zC3|IOuj~^YBO=Fklo@3mvd6I{Z*&FZ>iq* zxh|JuJoo2$p8MJ3zO@dQ;%1#~Mrm48 zB0053{1bDi_a@jo<4!@!`w4}B(&Qb`~IeSBh zu+_yIYl2Wgk+?x4pCmAM>x_SqBPUj#c`C`k>_fp@qPlAAwD$!zOxRkL7;=|nu(#ut zyF^;&hm-D_;ji{d6rOloACu5*NkF4IC3@rifMG(|^Skv$H&^YnYL*rpw=UCi;JOuz zN*NX(7wZXS4tF@6PIWAs%*j!$RoL*3sh)}iry%thDvN5AUM888q_(>|Tzt|Yea3AyMYBgm$H_`F^v2%)bux)3s znFIEBDK;-JS5SH|;1?afJb<*=c5puu=w%tv#ihn*R!^Hd$KWAp4$#`joJ*)$kNtZ z2Al6h>Z>(u?3tmzA4^d+jLKx{97!Pb4;CX&u;M||**7zXI7hO6nrdMx*Xa=|-`#1^ zBQ?Ha&7cd7hN=%y4yUp?zl8~Lo;%mQrDe8!ce-W_K94FFMN*g(w8q-_K5S+c0{o29X&PzpV;UJE^!xnFc%b@>kvW4m#xiOj-L*DadC&2N#0Us z;<-(m1WB7$=j6hjcPC6JB)D3T2#IC`ibu#yi!uK7W2!j|Z>~RaJ*&XXy#ytIk2DIp z5?Qd^s90_?ILjU#>ZWk5HXts}grg_!Gmgm!d?eLGR7xEP zvTCrslV~94ym5_i<5oqy(@@?wN}lIdtiY8=?|Ng!XeYnly`@9wCGx2S$3x|0x8T2h zz7A85Vb2>s44rKpI_4Y7_Pnd2^mYj2%^jM|Du>u4`^Psda^JIP%*DK6bo`Vf&f{!% zDTYCwF5Nhi=)QhU2$@eQv&ZzxsX+Hl+gP6kW|e!n9IU2>Vh~cioI{>4WvR}t*4Hpz z%5z?HjLGoka}Q3AbX9AkY|Yjf^M(>@tBAI9JO5pDCQu0R3Nns>)LC#vB2p96C*?K? zvX$un$sBDx$1=+NNj*@Oa@u*b@O*XBr_sg@8sCUq-|LK!MUmC)epklrv}5O_^<{NP zX16|c$9Wtbks3y7geI^tF5oRZJu;v zwkW8j+8Ccxo9stEDOT_Go&j%$KCgVO7pm+^%PKEPBZqbMw%s@732XS{cX+wCSjH1s z5)bc=g**<^NNsroY` z?}fHHlgu^B?2r{^^gQ&j zbF~T((>|Yg&C5WKL8DCnl1}Z3!YHFW2S1|;Xr0`Uz-;=FxEwYc4QpeAtnm7^f~uzX zl;xA!?>MLR?tL80Iudm;mi{!ewL91KhG7Hsa-XepKi<2mc6%zf0GwtbfJ1Zf-<@Xu z#|XWDzv|04t)&9Id!UxAAkN{t5qC%%8-WV3i;3duS19%m2||Y{!3pR1=g|zQYAMqc zff)_2nj-O4wfxy;UNM?|Uieo!^J$A*uDe>@V(NKH;KS;Y_dtE8${p>RdcrW;=2*fj4~d?OG0l-(g?ik}vz} z)5-wDppVts>K-=|@{=!53?=8)Jw#RGpS_FWpbwtn}{v!JEJ$q-sr7F6&OPBuI# zuVNFMPte79XgEu!P&qRq8u4J>r%$l-IQ00Lin90(_KtC)aR_de zxN=pY2<1b29_^AG2WJIGmmX4rv3$!`l15{e(H!1^+x9voZ6;882YAE12q7+lgy+>) zj|s0CyzI9=Mo!R}&LXB`&DYpZ7c?0r(&KNV+~TULd0y^e;G{KVR4nL0KvU9mr8&$^ zxrM-9P8zE`J?aZ(iB~Rz<{vvnk2HaZU#K$aVFfYnbAXVUOLU#As5JvS%+26 zi$sNuPY}dLGUS$0g&;oBqhzv2dY`l3@6Na403M!Sh${B|7(y|_cONa;6BrtUe@ZzV z7SThtHT8k?Rwc)(Z}@BP#H@JJHz&GR&M=E@P9KJ89yQKmRh&I~%vbL1L-K3E>7>CH z)Y!=jXVb1iPrAoAZZ3}3wU*5~nrV!ZjL5zqJ<@NwjHCZC>68Cc<{&E_#S;E*jOdjtg?uKN|l`P8sjz&Qf7a^z9 z;{3-8T+H4y99_zc;JYIvs!sk$G}` z??mt*Mm9Z@glCZb!X?!xXD-21sFDPEpZOK{sbQseQ$%6~b;n+*z0hRoR}0Pe>B|#t z$XrVcXv8M|q*Z8MY&r9J0A=d^1bHpjrUXu)qEj~$%%=gZp`^~%O*lzxUquG^p6;n; z^(3HL+hx4gRP?4N*b2p9!^|2~rcw3!9nQj$vmZusbXYz_x^AVc`3qBFm(jS9ueU5h z^AnNnbswfQ2Jq=W=T+p-V|nQco@bOAH$pLQZ+BKH8E$iM>IDz z3|wc?QP`yI=X5YTlp8h}%p6{Deq?S0QD$Ug>ih1SdPZg237Rl{S~=Ha4~-ckMoIWMn+X@@`V6 z#HHZj>MQbt$Qqp*9T(cjc^lxZ7UO(>PwzF-qEr(wo`vaulxdall|KP`7p4gd`23&Jy=#sAes*0diLB(U$Nx46VQvP)8idSs8^zaV91xw*O-JMH=)FoJshRob|_)O)ojtfP))WHCr(;*2;VMQ75^ zfN@a^f#o<|*9X;3IcGodLUz-3i~FAu+zI4c5h+nW^h_!^)b*B_xw-l4O$TB(ixaqW ziMoa%i=BeS<-F45kMO;Tw|FWa`G2c!SuOA3CbowPhF6csf1|&qqugUrj;UgGHm| z;j^yoH?MZhR;AYOW_XW2Lg2j%%ejL)B@*bUMD`g<#Z${1+fa57r7X82 zcqY-cfPnK%Y^3@szRner zt)bBToYCph6Jv*W+&t?&9FG4(Iu2w46 z4B#AcFy_^J@f*6<{>CN}Sj969*DYV*e7<61U>GoN{tz!Do90+jApFueVY_IW(MQF; zl?4yA_(MvMwN&pWKVyg{3uU_+y6RMdot2vu%mC?st=N0pf-~JZXE?3JFf)j<{1xsU z`2ephz)#HzsWEP!inHm2hI(V(~@W zY7gGU-lO52cHD&SY)>QHgy$=>^X%u0TQZfCizro!*weMyvZC=;MWOawdAx~`3C*W` z%^#^$uRP;gyqEE0<(i8xcQY$oc+6mY#z{-XFxsO1(cN8Y)>p;^q9|5bk`Z*p|c!?(rErw#y;yT(%@c7trQBv6cj)$3>pI z>tz+;IB?D=aQV=s(n)o63*yn8dX1m7#Z4G{%fF@K2o5n3jxR~mU?nzMi#;}8e#(>{ zy{Z4!AI)jZ8TY;nq1aq}tq;~=zzoTv)er06oeX3;9{uP{LWR*2%9cmE%S^`~!BW>X zn3PZFTf3g*dG68~^1*q@#^Ge(_8puPEFLD8OS|0b2a{5e=N4S%;~f3tC>F6UxK#v9 z)N-#Mv8=ePCh1KsUKD1A8jF_%$MPf|_yCN9oy%*@um6D{w*2|4GY zb}gafrSC+f=b*W{)!a!fqwZ9)K>fk=i4qf!4M?0v{CMNTo2A9}mQzV=%3UT&i{3{W z>ulG#M!K7%jPf6Mjff9BMslgQq3zIogY);Cv3v;&b#;^=sh#(Bn%W)H*bHNaLwdpq z85%fUTUJJNjYO_426T2TBj0D{6t zw&S_HZ|C?pI_2q(9Fas&@uJs6nVX;P*5K#6p|#)_(8PM-{L(;2wl`ma{ZAd5gA)?y z>0GSLoK<*FwW+G8@-M3vcffg7I(qm7lzF)n`Q9iCvp*mn7=|CjlpG{x z&r0n}XLWZ!>=lynUr7D`6n`7a_ZgT< zm!i;&?Fb0Q2QmqmCHfZ7ex=_tU~(7b)L?RIvPyEAU=gLIZ-VTAA~WR00yKyTXg^(G zqWLZJs!FnQYMOH3*fN&Tn(IKMLf{Ki?pRo8zZJ6YVyj)y0^)-sR}2-)%mI(Aw2AgT zbbp1T{qB(OSNJd0cVBH^tI>HR(q+#*lmi@LWe*rZz&M2h1L_=50uZ1e*n#E*`6?aw zj`ka&JpceRGe@}Ey1)Q~O}0qHRg4K_u>4e1arvJ7Q9!=t5AuzG`n=a-f0}{+lnCE#zu$`oVn44eS&T?N*wz~t~E&oQDBrB_MSg z_yVrQehWbD0xHX|v-hpselAu;O7s;P*!uAT`dr~}Lie=tknaGoiU?;*8Cwgala-65 zosOB4mATbdXJFujzgA4?UkCKE093A1KM?W&Pw>A?IACqg1z~IZYkdP70EeCfjii(n z3k%ax?4|rY(87N&_vhsyVK1zp@uils|B%`(V4e3%sj5f|i(eIhiSg-fHK1Pb0-mS^ zeh?WA7#{hhNci5e;?n*iVy|)iJiR>|8{TN3!=VBC2dN)~^ISSW_(g<^rHr$)nVrdA z39BMa5wl5q+5F@)4b%5-> zA^-P20l_e^S2PTa&HE2wf3jf)#)2ITVXzndeuMpPo8}kphQKhegB%QO+yBpDpgkcl z1nlPp14#+^bIA7__h16pMFECzKJ3p4`;Rf$gnr%{!5#oG42AH&X8hV8061%4W91ku z`OW_hyI+uBOqYXkVC&BqoKWmv;|{O|4d#Nay<)gkxBr^^N48(VDF7Sj#H1i3>9138 zkhxAU7;M)I18&d!Yw!V9zQA0tp(G4<8U5GX{YoYCQ?p56FxcD-2FwO5fqyx@__=$L zeK6Sg3>XQv)qz1?zW-k$_j`-)tf+yRU_%fXrenc>$^70d1Q-W?T#vy;6#Y-Q-<2)+ z5iTl6MA7j9m&oBhRXTKr*$3gec z3E;zX457RGZwUvD$l&8e42Qb^cbq>zYy@ive8`2N9vk=#6+AQlZZ7qk=?(ap1q0n0 z{B9Fte-{Gi-Tvax1)M+d1}Fyg@9X~sh1m|hsDcZuYOnxriBPN;z)q3<=-yBN2iM6V A?*IS* literal 0 HcmV?d00001 diff --git a/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/.mvn/wrapper/maven-wrapper.properties b/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..70f4f50fc --- /dev/null +++ b/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/mvnw b/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/mvnw new file mode 100755 index 000000000..8d937f4c1 --- /dev/null +++ b/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/mvnw.cmd b/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/mvnw.cmd new file mode 100644 index 000000000..f80fbad3e --- /dev/null +++ b/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/pom.xml b/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/pom.xml new file mode 100644 index 000000000..ac88cb596 --- /dev/null +++ b/src/test/resources/org/datadog/jenkins/plugins/datadog/tracer/test-maven-project/pom.xml @@ -0,0 +1,16 @@ + + + 4.0.0 + + org.example + simplest-maven-project + 1.0-SNAPSHOT + + + 8 + 8 + UTF-8 + + \ No newline at end of file From da81348770fe8ebf85b645df99e0170a81f2a24e Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 1 Sep 2023 11:03:26 +0200 Subject: [PATCH 08/14] Address review comments and fix minor issues --- .../datadog/tracer/JavaConfigurator.java | 37 ++++++++++++++++++- .../datadog/tracer/ShellCommandCallable.java | 2 +- .../DatadogTracerJobProperty/config.jelly | 2 +- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java index 72583e352..9aa159dcb 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java @@ -3,6 +3,8 @@ import hudson.FilePath; import hudson.model.Node; import hudson.util.Secret; +import java.net.MalformedURLException; +import java.net.URL; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -19,6 +21,9 @@ final class JavaConfigurator implements TracerConfigurator { private static final String TRACER_JAR_CACHE_TTL_ENV_VAR = "DATADOG_JENKINS_PLUGIN_TRACER_JAR_CACHE_TTL_MINUTES"; private static final int DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES = 60 * 12; private static final int TRACER_DOWNLOAD_TIMEOUT_MILLIS = 60_000; + private static final String DATADOG_DISTRIBUTION_HOST = "dtdg.co"; + private static final String MAVEN_CENTRAL_HOST = "repo1.maven.org"; + private static final String DATADOG_AGENT_MAVEN_DISTRIBUTION_PATH = "/maven2/com/datadoghq/dd-java-agent/"; private final HttpClient httpClient = new HttpClient(TRACER_DOWNLOAD_TIMEOUT_MILLIS); @@ -65,7 +70,35 @@ private int getTracerJarCacheTtlMinutes(DatadogTracerJobProperty tracerConfig private String getTracerDistributionUrl(DatadogTracerJobProperty tracerConfig) { String distributionUrl = getEnvVariable(tracerConfig, TRACER_DISTRIBUTION_URL_ENV_VAR); - return distributionUrl != null ? distributionUrl : DEFAULT_TRACER_DISTRIBUTION_URL; + if (distributionUrl != null) { + validateUserSuppliedTracerUrl(distributionUrl); + return distributionUrl; + } else { + return DEFAULT_TRACER_DISTRIBUTION_URL; + } + } + + private void validateUserSuppliedTracerUrl(String distributionUrl) { + URL url; + try { + url = new URL(distributionUrl); + } catch (MalformedURLException e) { + throw new IllegalArgumentException("Error while parsing tracer distribution URL: " + distributionUrl, e); + } + + String host = url.getHost(); + if (DATADOG_DISTRIBUTION_HOST.equals(host)) { + return; + } + + if (!MAVEN_CENTRAL_HOST.equals(host)) { + throw new IllegalArgumentException("Illegal tracer distribution host: " + host + " (" + distributionUrl + ")"); + } + + String path = url.getPath(); + if (!path.startsWith(DATADOG_AGENT_MAVEN_DISTRIBUTION_PATH)) { + throw new IllegalArgumentException("Illegal tracer distribution path: " + path + " (" + distributionUrl + ")"); + } } private String getEnvVariable(DatadogTracerJobProperty tracerConfig, String name) { @@ -73,7 +106,7 @@ private String getEnvVariable(DatadogTracerJobProperty tracerConfig, String n if (additionalVariables != null) { String envVariable = additionalVariables.get(name); if (envVariable != null) { - return name; + return envVariable; } } return System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/ShellCommandCallable.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/ShellCommandCallable.java index e205a8b28..09288a225 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/ShellCommandCallable.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/ShellCommandCallable.java @@ -13,7 +13,7 @@ public class ShellCommandCallable extends MasterToSlaveFileCallable { public ShellCommandCallable(long timeoutMillis, String... command) { this.timeoutMillis = timeoutMillis; - this.command = command; + this.command = Arrays.copyOf(command, command.length); } @Override diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly index c124e4128..39d7484a2 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly @@ -22,7 +22,7 @@
- + From 81ef5b56b51ca7fea5099bb62f0b0359eea6e18a Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 1 Sep 2023 11:23:45 +0200 Subject: [PATCH 09/14] Fix tracer injection tests to run on Windows --- .../plugins/datadog/tracer/TracerInjectionIT.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java b/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java index 2d5b0b382..819df1877 100644 --- a/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java +++ b/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java @@ -122,7 +122,7 @@ private WorkflowJob givenPipelineProject(boolean builtOnAgentNode) throws Except " stages {\n" + " stage('test'){\n" + " steps {\n" + - " sh \"./mvnw clean\"" + + " " + getMavenCommand() + "\n" + " }\n" + " }\n" + " }\n" + @@ -131,6 +131,16 @@ private WorkflowJob givenPipelineProject(boolean builtOnAgentNode) throws Except return job; } + private String getMavenCommand() { + return isRunningOnWindows() + ? "bat \"./mvnw.cmd clean\"" + : "sh \"./mvnw clean\""; + } + + private boolean isRunningOnWindows() { + return System.getProperty("os.name").toLowerCase().contains("win"); + } + private void givenProjectIsBuiltOnAgentNode(FreeStyleProject project) throws Exception { project.setAssignedNode(agentNode); } From d455e678cb9d9dba022ce17775acf03e8a151e79 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 1 Sep 2023 12:06:19 +0200 Subject: [PATCH 10/14] Fix tracer injection config serialization --- .../plugins/datadog/tracer/DatadogTracerJobProperty.java | 9 +++++++++ .../datadog/tracer/DatadogTracerJobProperty/config.jelly | 2 +- .../plugins/datadog/tracer/TracerInjectionIT.java | 1 - 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java index 2cabf186e..1903a377c 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty.java @@ -7,6 +7,7 @@ import hudson.model.JobProperty; import hudson.model.JobPropertyDescriptor; import java.io.Serializable; +import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; import java.util.HashMap; @@ -49,6 +50,14 @@ public Map getAdditionalVariables() { return additionalVariables; } + public List getAdditionalVariablesAsList() { + List list = new ArrayList<>(); + for (Map.Entry e : additionalVariables.entrySet()) { + list.add(new DatadogTracerEnvironmentProperty(e.getKey(), e.getValue())); + } + return list; + } + @Extension public static final class DatadogTracerJobPropertyDescriptor extends JobPropertyDescriptor { @NonNull diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly index 39d7484a2..78c59de7a 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/config.jelly @@ -18,7 +18,7 @@ - +
diff --git a/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java b/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java index 819df1877..baae85bb6 100644 --- a/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java +++ b/src/test/java/org/datadog/jenkins/plugins/datadog/tracer/TracerInjectionIT.java @@ -4,7 +4,6 @@ import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.Job; -import hudson.model.Label; import hudson.model.TopLevelItem; import hudson.slaves.DumbSlave; import hudson.tasks.Shell; From b6799391cbdef0d62c31adce03328c0d1ef3cc43 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Thu, 7 Sep 2023 13:01:42 +0200 Subject: [PATCH 11/14] Add signature verification when downloading Java tracer from Maven Central --- pom.xml | 5 + .../datadog/tracer/JavaConfigurator.java | 77 ++++++++----- .../tracer/signature/SignatureVerifier.java | 101 ++++++++++++++++++ 3 files changed, 155 insertions(+), 28 deletions(-) create mode 100644 src/main/java/org/datadog/jenkins/plugins/datadog/tracer/signature/SignatureVerifier.java diff --git a/pom.xml b/pom.xml index 37ae20295..77a5e6e65 100644 --- a/pom.xml +++ b/pom.xml @@ -167,6 +167,11 @@ jetty-client 9.4.51.v20230217 + + org.bouncycastle + bcpg-jdk18on + 1.72 + diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java index 9aa159dcb..a3931f33b 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java @@ -3,14 +3,18 @@ import hudson.FilePath; import hudson.model.Node; import hudson.util.Secret; +import java.io.ByteArrayInputStream; +import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; +import java.util.function.Function; import jenkins.model.Jenkins; import org.datadog.jenkins.plugins.datadog.clients.HttpClient; +import org.datadog.jenkins.plugins.datadog.tracer.signature.SignatureVerifier; final class JavaConfigurator implements TracerConfigurator { @@ -53,32 +57,59 @@ private FilePath downloadTracer(DatadogTracerJobProperty tracerConfig, FilePa } }); + if (!DEFAULT_TRACER_DISTRIBUTION_URL.equals(tracerDistributionUrl)) { + // verify signature if downloading from Maven Central + String signatureFileUrl = tracerDistributionUrl + ".asc"; + byte[] signaturePublicKey = getTracerSignaturePublicKey(tracerConfig); + + httpClient.getBinary(signatureFileUrl, Collections.emptyMap(), signatureStream -> { + try (InputStream tracerStream = datadogTracerFile.read(); + InputStream publicKeyStream = new ByteArrayInputStream(signaturePublicKey)) { + boolean signatureValid = SignatureVerifier.verifySignature(tracerStream, signatureStream, publicKeyStream); + if (!signatureValid) { + throw new IllegalStateException("Tracer downloaded from " + tracerDistributionUrl + " is not signed with a valid signature"); + } + } catch (Exception e) { + throw new RuntimeException("Error while verifying tracer signature", e); + } + }); + } + return datadogTracerFile.absolutize(); } private int getTracerJarCacheTtlMinutes(DatadogTracerJobProperty tracerConfig) { - String ttl = getEnvVariable(tracerConfig, TRACER_JAR_CACHE_TTL_ENV_VAR); - if (ttl != null) { - try { - return Integer.parseInt(ttl); - } catch (Exception e) { - // ignored - } - } - return DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES; + return getSetting(tracerConfig, TRACER_JAR_CACHE_TTL_ENV_VAR, DEFAULT_TRACER_JAR_CACHE_TTL_MINUTES, Integer::parseInt); } private String getTracerDistributionUrl(DatadogTracerJobProperty tracerConfig) { - String distributionUrl = getEnvVariable(tracerConfig, TRACER_DISTRIBUTION_URL_ENV_VAR); - if (distributionUrl != null) { - validateUserSuppliedTracerUrl(distributionUrl); - return distributionUrl; - } else { - return DEFAULT_TRACER_DISTRIBUTION_URL; + return getSetting(tracerConfig, TRACER_DISTRIBUTION_URL_ENV_VAR, DEFAULT_TRACER_DISTRIBUTION_URL, this::validateUserSuppliedTracerUrl); + } + + private byte[] getTracerSignaturePublicKey(DatadogTracerJobProperty tracerConfig) { + return getSetting(tracerConfig, TRACER_DISTRIBUTION_URL_ENV_VAR, SignatureVerifier.DATADOG_PUBLIC_KEY, String::getBytes); + } + + private T getSetting(DatadogTracerJobProperty tracerConfig, String envVariableName, T defaultValue, Function parser) { + String envVariable = getEnvVariable(tracerConfig, envVariableName); + if (envVariable != null) { + return parser.apply(envVariable); } + return defaultValue; } - private void validateUserSuppliedTracerUrl(String distributionUrl) { + private String getEnvVariable(DatadogTracerJobProperty tracerConfig, String name) { + Map additionalVariables = tracerConfig.getAdditionalVariables(); + if (additionalVariables != null) { + String envVariable = additionalVariables.get(name); + if (envVariable != null) { + return envVariable; + } + } + return System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); + } + + private String validateUserSuppliedTracerUrl(String distributionUrl) { URL url; try { url = new URL(distributionUrl); @@ -88,7 +119,7 @@ private void validateUserSuppliedTracerUrl(String distributionUrl) { String host = url.getHost(); if (DATADOG_DISTRIBUTION_HOST.equals(host)) { - return; + return distributionUrl; } if (!MAVEN_CENTRAL_HOST.equals(host)) { @@ -99,17 +130,7 @@ private void validateUserSuppliedTracerUrl(String distributionUrl) { if (!path.startsWith(DATADOG_AGENT_MAVEN_DISTRIBUTION_PATH)) { throw new IllegalArgumentException("Illegal tracer distribution path: " + path + " (" + distributionUrl + ")"); } - } - - private String getEnvVariable(DatadogTracerJobProperty tracerConfig, String name) { - Map additionalVariables = tracerConfig.getAdditionalVariables(); - if (additionalVariables != null) { - String envVariable = additionalVariables.get(name); - if (envVariable != null) { - return envVariable; - } - } - return System.getenv(TRACER_JAR_CACHE_TTL_ENV_VAR); + return distributionUrl; } private static Map getEnvVariables(DatadogTracerJobProperty tracerConfig, diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/signature/SignatureVerifier.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/signature/SignatureVerifier.java new file mode 100644 index 000000000..e1cc21378 --- /dev/null +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/signature/SignatureVerifier.java @@ -0,0 +1,101 @@ +package org.datadog.jenkins.plugins.datadog.tracer.signature; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import org.bouncycastle.openpgp.PGPCompressedData; +import org.bouncycastle.openpgp.PGPLiteralData; +import org.bouncycastle.openpgp.PGPObjectFactory; +import org.bouncycastle.openpgp.PGPPublicKeyRing; +import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; +import org.bouncycastle.openpgp.PGPSignature; +import org.bouncycastle.openpgp.PGPSignatureList; +import org.bouncycastle.openpgp.PGPUtil; +import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator; +import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider; + +public class SignatureVerifier { + + public static final byte[] DATADOG_PUBLIC_KEY = ( + "-----BEGIN PGP PUBLIC KEY BLOCK-----\n" + + "Version: Hockeypuck 2.1.0-222-g25248d4\n" + + "Comment: Hostname:\n" + + "\n" + + "xsFNBGBbo2cBEAC16RsAMkhlN1YYzmihO//AwHRQ+n33bnmXsGkXgp2vKPcM7bty\n" + + "oiZxdz3FAM6fBlBKG0RNn7DBEmkiu2EdxFCp7zLzLa2NC3KW89D0GnmkvX9Uebgf\n" + + "Iv8a4QcMHsWl3sAINnbiy2uNnJqmDzA5ofsAkJyL9fEMVdagLASC/CsxckxPDPgg\n" + + "RBp8Et625lMdIA4Owf5ZPibYVMR5xOdoucsH3KFGJNVyvX+xwx8hQDyLMg7hbI0T\n" + + "9nu840oZR+CQqndu6sFxqxGNzbwRYoJO/zZKttwnfDQnruJjkGL8dptHxuBJ7c+8\n" + + "TAabUzvbhNltuJDnt3+qKbV9hg1+tNgbA6oo1E5xONzg4mm/IG9TzejU1uFGNRC2\n" + + "2PSzwG8ps9saB61+Px3/1VmYFisdpaGssQJHbSFylQcgWJx4gVo0EBZER/i+JLn6\n" + + "g8AiNf2RQoFKkliHMHgR0UXek+5vxiPYCF5fqMvpDqPjKq0TgbVZyfPz50LrNEy/\n" + + "HA/a3hdJbYyMThNQ1LTKQVW7JJnIO/87P3/XV0wSpwt4JBJHXNFk+w1YY/DbAHyS\n" + + "OGDxYUvJ8AOz1gvt8MBf/pDoV/kbY8b+PsX41eCe0uQ58tmbXhAXBZss2P2AcuZq\n" + + "BwNho0CnfXWp04g5I3FlaWb+/ZMQ+/AsXgbTWCRldC+P2Cou5zPVrGrgMQARAQAB\n" + + "zWdEYXRhZG9nIGRkLXRyYWNlLWphdmEgUGFja2FnaW5nIChEYXRhZG9nIGRkLXRy\n" + + "YWNlLWphdmEgUGFja2FnaW5nKSA8cGFja2FnZStkZC10cmFjZS1qYXZhQGRhdGFk\n" + + "b2docS5jb20+wsGTBBMBCAA9FiEE2O7camr/v79OPdjRyiBgiJT0O00FAmBbo2cC\n" + + "GwMFCQICKQAECwkIBwUVCgkICwUWAwIBAAIeAQIXgAAKCRDKIGCIlPQ7TV2RD/4w\n" + + "wypKpk4GFYoxnfpsNT7g3U1ZSy3qGwabo4FxXN0mH0i92AI2bREWKjkvQQcQUmfR\n" + + "+vG05nyF0MJ3Vpre/Qzt7TOcy2sBIOpFzo4pMJpRHp5W9Pqm+PCUpzs+X5LBz04i\n" + + "6DRhNWT0kBJI9U5mQCdZETEHQZ8iUC/UAfNkXRrUMNF6OcjkPhWUPZB2OtH07bZl\n" + + "GZkX9iwxUcM7nsAbj/qnqcVAxSnr3ylYSBo8ctgEIY/YsQsMzq6JasxtBCaMMz10\n" + + "TflGD0bNV0zd8xjY4OfF42C9W+o0lDlTPq3HkxOUC/uUmaX/gSniJOyAp9wtD3Al\n" + + "P9oi3RWXEAdbIQ/D38smTYZD/0VopeoX0M7QrH6ifsCCRiMj/rbw3M/KDheWDk6w\n" + + "5CKpYDqJVmsVvWm+h7H51nQTM5CZLXHkasWmhOkj48SU3p+NSAnvQywaVW9drU79\n" + + "wxjUgCXSwl8IHmTDSEbrBRbLSXWLiGGeqw+EmLZckJE6BQNDFYflkVLuObhNJtRi\n" + + "pZtYi8gqyelflomEN6YBJ8dOk6SCcnU6SEzua/2YpYsHakGld0/uyux2MfXwCiJ9\n" + + "Wf37KG6e1eegDQWy8BPg6iRoIaEyyeEWQ8CpG8ZG2zfMxUOe4pqsRfUT5k2LE5kx\n" + + "IPdMz7WGf1S8iuZcBwF6PhAqJJv41pJ0mO4ewnZbnQ==\n" + + "=7erW\n" + + "-----END PGP PUBLIC KEY BLOCK-----" + ).getBytes(StandardCharsets.UTF_8); + + public static boolean verifySignature(InputStream artifactStream, InputStream signatureStream, InputStream publicKeyStream) throws Exception { + PGPPublicKeyRing publicKeys = loadPublicKeyRing(publicKeyStream); + PGPSignature signature = loadSignature(signatureStream); + signature.init(new BcPGPContentVerifierBuilderProvider(), publicKeys.getPublicKey()); + readSignedContentInto(signature, artifactStream); + return signature.verify(); + } + + private static PGPPublicKeyRing loadPublicKeyRing(InputStream keyStream) throws Exception { + InputStream keyIn = PGPUtil.getDecoderStream(keyStream); + PGPPublicKeyRingCollection pgpRing = new PGPPublicKeyRingCollection(keyIn, new BcKeyFingerprintCalculator()); + return pgpRing.getKeyRings().next(); + } + + private static PGPSignature loadSignature(InputStream signatureStream) throws Exception { + InputStream sigInputStream = PGPUtil.getDecoderStream(signatureStream); + PGPObjectFactory pgpObjectFactory = new PGPObjectFactory(sigInputStream, new BcKeyFingerprintCalculator()); + + Object object; + while ((object = pgpObjectFactory.nextObject()) != null) { + if (object instanceof PGPSignatureList) { + return ((PGPSignatureList) object).get(0); + } + + if (object instanceof PGPCompressedData) { + pgpObjectFactory = new PGPObjectFactory(((PGPCompressedData) object).getDataStream(), + new BcKeyFingerprintCalculator()); + } + + if (object instanceof PGPLiteralData) { + InputStream dataStream = ((PGPLiteralData) object).getDataStream(); + byte[] buf = new byte[8192]; + while (dataStream.read(buf) > 0) { + } + } + } + throw new IllegalArgumentException("PGP signature not found"); + } + + private static void readSignedContentInto(PGPSignature signature, InputStream inputStream) throws IOException { + byte[] buf = new byte[8192]; + int t; + while ((t = inputStream.read(buf)) >= 0) { + signature.update(buf, 0, t); + } + } + +} From 6290fa19963e8e3254a8cbaf8c1417026b302752 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Thu, 7 Sep 2023 16:44:52 +0200 Subject: [PATCH 12/14] Address Spotbugs warning --- .../jenkins/plugins/datadog/tracer/JavaConfigurator.java | 3 ++- .../plugins/datadog/tracer/signature/SignatureVerifier.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java index a3931f33b..99f221373 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/JavaConfigurator.java @@ -7,6 +7,7 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -87,7 +88,7 @@ private String getTracerDistributionUrl(DatadogTracerJobProperty tracerConfig } private byte[] getTracerSignaturePublicKey(DatadogTracerJobProperty tracerConfig) { - return getSetting(tracerConfig, TRACER_DISTRIBUTION_URL_ENV_VAR, SignatureVerifier.DATADOG_PUBLIC_KEY, String::getBytes); + return getSetting(tracerConfig, TRACER_DISTRIBUTION_URL_ENV_VAR, SignatureVerifier.DATADOG_PUBLIC_KEY.getBytes(StandardCharsets.UTF_8), String::getBytes); } private T getSetting(DatadogTracerJobProperty tracerConfig, String envVariableName, T defaultValue, Function parser) { diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/signature/SignatureVerifier.java b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/signature/SignatureVerifier.java index e1cc21378..0f436674b 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/signature/SignatureVerifier.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/tracer/signature/SignatureVerifier.java @@ -16,7 +16,7 @@ public class SignatureVerifier { - public static final byte[] DATADOG_PUBLIC_KEY = ( + public static final String DATADOG_PUBLIC_KEY = ( "-----BEGIN PGP PUBLIC KEY BLOCK-----\n" + "Version: Hockeypuck 2.1.0-222-g25248d4\n" + "Comment: Hostname:\n" + @@ -49,7 +49,7 @@ public class SignatureVerifier { "IPdMz7WGf1S8iuZcBwF6PhAqJJv41pJ0mO4ewnZbnQ==\n" + "=7erW\n" + "-----END PGP PUBLIC KEY BLOCK-----" - ).getBytes(StandardCharsets.UTF_8); + ); public static boolean verifySignature(InputStream artifactStream, InputStream signatureStream, InputStream publicKeyStream) throws Exception { PGPPublicKeyRing publicKeys = loadPublicKeyRing(publicKeyStream); From b53ace7b2386e39c5563d0cfe9cb2c027893e264 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Wed, 27 Sep 2023 16:57:42 +0200 Subject: [PATCH 13/14] Remove Application Key configuration since the backend no longer requires it --- README.md | 4 +- .../datadog/DatadogGlobalConfiguration.java | 145 ------------------ .../tracer/DatadogTracerConfigurator.java | 1 - .../DatadogGlobalConfiguration/config.jelly | 7 - .../help-targetApplicationKeyEntry.html | 4 - ...-targetCredentialsApplicationKeyEntry.html | 6 - .../DatadogTracerJobProperty/help-on.html | 1 + 7 files changed, 4 insertions(+), 164 deletions(-) delete mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html delete mode 100644 src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html diff --git a/README.md b/README.md index 1ced9ebe9..1d8facc40 100644 --- a/README.md +++ b/README.md @@ -232,7 +232,9 @@ The plugin can automatically configure Datadog getCommonEnvVariables(DatadogGlobalConfigurat variables.put("DD_CIVISIBILITY_AGENTLESS_ENABLED", "true"); variables.put("DD_SITE", getSite(datadogConfig.getTargetApiURL())); variables.put("DD_API_KEY", Secret.toString(datadogConfig.getUsedApiKey())); - variables.put("DD_APPLICATION_KEY", Secret.toString(datadogConfig.getUsedApplicationKey())); break; case DSD: variables.put("DD_AGENT_HOST", datadogConfig.getTargetHost()); diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly index 191f675ee..7f0b723d6 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/config.jelly @@ -61,13 +61,6 @@ - - - - - - - diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html deleted file mode 100644 index c8d6728f0..000000000 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetApplicationKeyEntry.html +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html deleted file mode 100644 index bc9c0ae11..000000000 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/DatadogGlobalConfiguration/help-targetCredentialsApplicationKeyEntry.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Enter your Datadog application key, which can be found - here. - This field is an alternative to specifying the application key directly (field above), use it only if you would like to store your application key with - Jenkins Credentials. -
diff --git a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html index 14eb46c98..ee4ea96bc 100644 --- a/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html +++ b/src/main/resources/org/datadog/jenkins/plugins/datadog/tracer/DatadogTracerJobProperty/help-on.html @@ -1,4 +1,5 @@
Enable Datadog Test Visibility for this job. This requires configuring Datadog Plugin connectivity. + Please bear in mind that Test Visibility is a separate Datadog product that is billed separately.
From a36066df0f2cedade0c158ba39ea66e05380a4c1 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Thu, 28 Sep 2023 13:23:28 +0200 Subject: [PATCH 14/14] Fix post-merge compilation issue --- .../org/datadog/jenkins/plugins/datadog/clients/HttpClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/clients/HttpClient.java b/src/main/java/org/datadog/jenkins/plugins/datadog/clients/HttpClient.java index 95f140636..e72babe77 100644 --- a/src/main/java/org/datadog/jenkins/plugins/datadog/clients/HttpClient.java +++ b/src/main/java/org/datadog/jenkins/plugins/datadog/clients/HttpClient.java @@ -187,7 +187,7 @@ public T get(String url, Map headers, Function re } public void getBinary(String url, Map headers, Consumer responseParser) throws ExecutionException, InterruptedException, TimeoutException, IOException { - ensureProxyConfiguration(); + ensureClientIsUpToDate(); Request request = requestSupplier(url, HttpMethod.GET, headers, null, null).get(); InputStreamResponseListener responseListener = new InputStreamResponseListener();