Skip to content

Commit 0921d3d

Browse files
jandro996jandro996
authored
Merge branch 'master' into alejandro.gonzalez/Optimize-IAST-Vulnerability-Detection
2 parents 472547c + d8d6af0 commit 0921d3d

34 files changed

Lines changed: 1721 additions & 237 deletions

File tree

‎.github/workflows/add-release-to-cloudfoundry.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
run: |
4444
echo "${{ steps.get-release-version.outputs.VERSION }}: ${{ steps.get-release-url.outputs.URL }}" >> index.yml
4545
- name: Commit and push changes
46-
uses: planetscale/ghcommit-action@5b20c92facae8dbf8a3836dc65b8503dda378573 # v0.2.13
46+
uses: planetscale/ghcommit-action@6a383e778f6620afde4bf4b45069d3c6983c1ae2 # v0.2.15
4747
with:
4848
commit_message: "chore: Add version ${{ steps.get-release-version.outputs.VERSION }} to Cloud Foundry"
4949
repo: ${{ github.repository }}

‎dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemModuleImpl.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import datadog.trace.api.civisibility.domain.JavaAgent;
1313
import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
1414
import datadog.trace.api.config.CiVisibilityConfig;
15+
import datadog.trace.api.config.GeneralConfig;
1516
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1617
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
1718
import datadog.trace.bootstrap.instrumentation.api.Tags;
@@ -99,6 +100,8 @@ public <T extends CoverageCalculator> BuildSystemModuleImpl(
99100
settings =
100101
new BuildModuleSettings(
101102
getPropertiesPropagatedToChildProcess(
103+
config.getServiceName(),
104+
config.isServiceNameSetByUser(),
102105
moduleName,
103106
startCommand,
104107
classpath,
@@ -125,6 +128,8 @@ public void set(Map<String, String> carrier, String key, String value) {
125128
}
126129

127130
private Map<String, String> getPropertiesPropagatedToChildProcess(
131+
String serviceName,
132+
boolean userProvidedServiceName,
128133
String moduleName,
129134
String startCommand,
130135
@Nullable Collection<Path> classpath,
@@ -190,6 +195,11 @@ private Map<String, String> getPropertiesPropagatedToChildProcess(
190195
CiVisibilityConfig.CIVISIBILITY_INJECTED_TRACER_VERSION),
191196
TracerVersion.TRACER_VERSION);
192197

198+
propagatedSystemProperties.put(
199+
Strings.propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME), serviceName);
200+
propagatedSystemProperties.put(
201+
Strings.propertyNameToSystemPropertyName(GeneralConfig.SERVICE_NAME_SET_BY_USER),
202+
String.valueOf(userProvidedServiceName));
193203
propagatedSystemProperties.put(
194204
Strings.propertyNameToSystemPropertyName(CiVisibilityConfig.CIVISIBILITY_MODULE_NAME),
195205
moduleName);

‎dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
368368
}
369369
}
370370

371-
def generateTestFixtures(testcaseName, events, coverages, additionalReplacements, additionalIgnoredTags) {
371+
def generateTestFixtures(String testcaseName, List<Map> events, List<Map> coverages, Map<String, String> additionalReplacements, List<String> additionalIgnoredTags) {
372372
def clazz = this.getClass()
373373
def resourceName = "/" + clazz.name.replace('.', '/') + ".class"
374374
def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart
@@ -380,7 +380,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
380380
submoduleName = "test"
381381
}
382382
def baseTemplatesPath = modulePath + "/src/" + submoduleName + "/resources/" + testcaseName
383-
CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements, additionalIgnoredTags)
383+
CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements.keySet(), additionalIgnoredTags)
384384
return [:]
385385
}
386386

‎dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import spock.lang.Specification
66
abstract class CiVisibilitySmokeTest extends Specification {
77
static final List<String> SMOKE_IGNORED_TAGS = ["content.meta.['_dd.integration']"]
88

9-
protected verifyEventsAndCoverages(String projectName, String toolchain, String toolchainVersion, List<Map<String, Object>> events, List<Map<String, Object>> coverages) {
9+
protected verifyEventsAndCoverages(String projectName, String toolchain, String toolchainVersion, List<Map<String, Object>> events, List<Map<String, Object>> coverages, List<String> additionalDynamicTags = []) {
1010
def additionalReplacements = ["content.meta.['test.toolchain']": "$toolchain:$toolchainVersion"]
1111

1212
if (System.getenv().get("GENERATE_TEST_FIXTURES") != null) {
1313
def baseTemplatesPath = CiVisibilitySmokeTest.classLoader.getResource(projectName).toURI().schemeSpecificPart.replace('build/resources/test', 'src/test/resources')
14-
CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements, SMOKE_IGNORED_TAGS)
14+
CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements.keySet() + additionalDynamicTags, SMOKE_IGNORED_TAGS)
1515
} else {
16-
CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements, SMOKE_IGNORED_TAGS)
16+
CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements, SMOKE_IGNORED_TAGS, additionalDynamicTags)
1717
}
1818
}
1919

‎dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,28 +71,28 @@ abstract class CiVisibilityTestUtils {
7171
/**
7272
* Use this method to generate expected data templates
7373
*/
74-
static void generateTemplates(String baseTemplatesPath, List<Map<?, ?>> events, List<Map<?, ?>> coverages, Map<String, String> additionalReplacements, List<String> ignoredTags = []) {
74+
static void generateTemplates(String baseTemplatesPath, List<Map<?, ?>> events, List<Map<?, ?>> coverages, Collection<String> additionalDynamicPaths, List<String> ignoredTags = []) {
7575
if (!ignoredTags.empty) {
7676
events = removeTags(events, ignoredTags)
7777
}
7878
events.sort(EVENT_RESOURCE_COMPARATOR)
7979

8080
def templateGenerator = new TemplateGenerator(new LabelGenerator())
81-
def compiledAdditionalReplacements = compile(additionalReplacements.keySet())
81+
def compiledAdditionalReplacements = compile(additionalDynamicPaths)
8282

8383
Files.createDirectories(Paths.get(baseTemplatesPath))
8484
Files.write(Paths.get(baseTemplatesPath, "events.ftl"), templateGenerator.generateTemplate(events, EVENT_DYNAMIC_PATHS + compiledAdditionalReplacements).bytes)
8585
Files.write(Paths.get(baseTemplatesPath, "coverages.ftl"), templateGenerator.generateTemplate(coverages, COVERAGE_DYNAMIC_PATHS + compiledAdditionalReplacements).bytes)
8686
}
8787

88-
static Map<String, String> assertData(String baseTemplatesPath, List<Map<?, ?>> events, List<Map<?, ?>> coverages, Map<String, String> additionalReplacements, List<String> ignoredTags) {
88+
static Map<String, String> assertData(String baseTemplatesPath, List<Map<?, ?>> events, List<Map<?, ?>> coverages, Map<String, String> additionalReplacements, List<String> ignoredTags, List<String> additionalDynamicPaths = []) {
8989
events.sort(EVENT_RESOURCE_COMPARATOR)
9090

9191
def labelGenerator = new LabelGenerator()
9292
def templateGenerator = new TemplateGenerator(labelGenerator)
9393

9494
def replacementMap
95-
replacementMap = templateGenerator.generateReplacementMap(events, EVENT_DYNAMIC_PATHS)
95+
replacementMap = templateGenerator.generateReplacementMap(events, EVENT_DYNAMIC_PATHS + compile(additionalDynamicPaths))
9696
replacementMap = templateGenerator.generateReplacementMap(coverages, COVERAGE_DYNAMIC_PATHS)
9797

9898
for (Map.Entry<String, String> e : additionalReplacements.entrySet()) {

‎dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/proxy_ignored_class_name.trie‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,7 @@
3535
1 $HibernateInstantiator$*
3636
1 $HibernateProxy$*
3737
1 $HibernateAccessOptimizer$*
38+
# Quarkus generated jaxrs stubs
39+
1 $$QuarkusRestClientInterface
40+
# CDI stubs
41+
1 $$CDIWrapper*

‎dd-java-agent/instrumentation/servicetalk/build.gradle‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1 @@
1-
plugins {
2-
id 'java-test-fixtures'
3-
}
4-
5-
muzzle {
6-
pass {
7-
group = 'io.servicetalk'
8-
module = 'servicetalk-concurrent-api'
9-
// prev versions missing ContextMap
10-
versions = '[0.41.12,)'
11-
assertInverse = true
12-
}
13-
pass {
14-
group = 'io.servicetalk'
15-
module = 'servicetalk-context-api'
16-
versions = '[0.1.0,)'
17-
assertInverse = true
18-
}
19-
}
20-
21-
ext {
22-
minJavaVersionForTests = JavaVersion.VERSION_11
23-
}
24-
251
apply from: "$rootDir/gradle/java.gradle"
26-
27-
addTestSuiteForDir('latestDepTest', 'test')
28-
29-
dependencies {
30-
compileOnly group: 'io.servicetalk', name: 'servicetalk-concurrent-api', version: '0.42.45'
31-
compileOnly group: 'io.servicetalk', name: 'servicetalk-context-api', version: '0.42.45'
32-
33-
testImplementation group: 'io.servicetalk', name: 'servicetalk-concurrent-api', version: '0.42.0'
34-
testImplementation group: 'io.servicetalk', name: 'servicetalk-context-api', version: '0.42.0'
35-
36-
latestDepTestImplementation group: 'io.servicetalk', name: 'servicetalk-concurrent-api', version: '+'
37-
latestDepTestImplementation group: 'io.servicetalk', name: 'servicetalk-context-api', version: '+'
38-
}
39-

0 commit comments

Comments
 (0)