Skip to content

Commit 7caf517

Browse files
sezen-datadogsezen-datadog
authored
Merge branch 'master' into sezen.leblay/APPSEC-57893-activation-origin-metric
2 parents c10321b + 562e533 commit 7caf517

File tree

15 files changed

+161
-36
lines changed

15 files changed

+161
-36
lines changed

‎.gitlab-ci.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,12 @@ default:
137137
KUBERNETES_MEMORY_REQUEST: 8Gi
138138
KUBERNETES_MEMORY_LIMIT: 8Gi
139139
CACHE_TYPE: lib #default
140+
FF_USE_FASTZIP: "true"
141+
CACHE_COMPRESSION_LEVEL: "slowest"
142+
140143
RUNTIME_AVAILABLE_PROCESSORS_OVERRIDE: 4 # Runtime.getRuntime().availableProcessors() returns incorrect or very high values in Kubernetes
141144
cache:
142-
- key: '$CI_SERVER_VERSION-$CACHE_TYPE' # Dependencies cache. Reset the cache every time gitlab is upgraded. ~Every couple months
145+
- key: dependency-$CACHE_TYPE # Dependencies cache
143146
paths:
144147
# Cached dependencies and wrappers for gradle
145148
- .gradle/wrapper
@@ -148,8 +151,8 @@ default:
148151
policy: $DEPENDENCY_CACHE_POLICY
149152
unprotect: true
150153
fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache
151-
- '$CI_SERVER_VERSION-base'
152-
- '$CI_SERVER_VERSION-lib'
154+
- 'dependency-base'
155+
- 'dependency-lib'
153156
- key: $CI_PIPELINE_ID-$CACHE_TYPE # Incremental build cache. Shared by all jobs in the pipeline of the same type
154157
paths:
155158
- .gradle/caches/$GRADLE_VERSION
@@ -837,7 +840,7 @@ package-oci:
837840

838841
configure_system_tests:
839842
variables:
840-
SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,docker-ssi,lib-injection"
843+
SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,simple_onboarding_appsec,docker-ssi,lib-injection"
841844

842845
create_key:
843846
stage: generate-signing-key

‎buildSrc/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ dependencies {
4646
implementation("org.ow2.asm", "asm", "9.8")
4747
implementation("org.ow2.asm", "asm-tree", "9.8")
4848

49-
testImplementation("org.spockframework", "spock-core", "2.3-groovy-3.0")
49+
testImplementation(libs.spock.core)
5050
testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17")
5151
}
5252

‎buildSrc/call-site-instrumentation-plugin/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies {
3737
implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
3838

3939
testImplementation("net.bytebuddy", "byte-buddy", "1.17.5")
40-
testImplementation("org.spockframework", "spock-core", "2.3-groovy-3.0")
40+
testImplementation(libs.spock.core)
4141
testImplementation("org.objenesis", "objenesis", "3.0.1")
4242
testImplementation("org.codehaus.groovy", "groovy-all", "3.0.17")
4343
testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")

‎buildSrc/settings.gradle.kts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
11
include(":call-site-instrumentation-plugin")
2+
3+
dependencyResolutionManagement {
4+
versionCatalogs {
5+
create("libs") {
6+
from(files("../gradle/libs.versions.toml"))
7+
}
8+
}
9+
}

‎communication/src/main/java/datadog/communication/ddagent/DDAgentFeaturesDiscovery.java‎

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package datadog.communication.ddagent;
22

3+
import static datadog.communication.http.OkHttpUtils.DATADOG_CONTAINER_ID;
4+
import static datadog.communication.http.OkHttpUtils.DATADOG_CONTAINER_TAGS_HASH;
35
import static datadog.communication.serialization.msgpack.MsgPackWriter.FIXARRAY;
4-
import static java.util.Collections.emptyList;
6+
import static java.util.Collections.emptySet;
57
import static java.util.Collections.singletonList;
6-
import static java.util.Collections.unmodifiableList;
8+
import static java.util.Collections.unmodifiableSet;
79

810
import com.squareup.moshi.JsonAdapter;
911
import com.squareup.moshi.Moshi;
1012
import com.squareup.moshi.Types;
13+
import datadog.common.container.ContainerInfo;
1114
import datadog.communication.http.OkHttpUtils;
1215
import datadog.communication.monitor.DDAgentStatsDClientManager;
1316
import datadog.communication.monitor.Monitoring;
@@ -88,8 +91,8 @@ public class DDAgentFeaturesDiscovery implements DroppingPolicy {
8891
private volatile String evpProxyEndpoint;
8992
private volatile String version;
9093
private volatile String telemetryProxyEndpoint;
91-
private volatile List<String> peerTags = emptyList();
92-
private volatile List<String> spanKindsToComputedStats = emptyList();
94+
private volatile Set<String> peerTags = emptySet();
95+
private volatile Set<String> spanKindsToComputedStats = emptySet();
9396

9497
private long lastTimeDiscovered;
9598

@@ -123,8 +126,8 @@ private void reset() {
123126
version = null;
124127
lastTimeDiscovered = 0;
125128
telemetryProxyEndpoint = null;
126-
peerTags = emptyList();
127-
spanKindsToComputedStats = emptyList();
129+
peerTags = emptySet();
130+
spanKindsToComputedStats = emptySet();
128131
}
129132

130133
/** Run feature discovery, unconditionally. */
@@ -157,11 +160,15 @@ private void doDiscovery() {
157160
// 3. fallback if the endpoint couldn't be found or the response couldn't be parsed
158161
try (Recording recording = discoveryTimer.start()) {
159162
boolean fallback = true;
160-
try (Response response =
161-
client
162-
.newCall(new Request.Builder().url(agentBaseUrl.resolve("info").url()).build())
163-
.execute()) {
163+
final Request.Builder requestBuilder =
164+
new Request.Builder().url(agentBaseUrl.resolve("info").url());
165+
final String containerId = ContainerInfo.get().getContainerId();
166+
if (containerId != null) {
167+
requestBuilder.header(DATADOG_CONTAINER_ID, containerId);
168+
}
169+
try (Response response = client.newCall(requestBuilder.build()).execute()) {
164170
if (response.isSuccessful()) {
171+
processInfoResponseHeaders(response);
165172
fallback = !processInfoResponse(response.body().string());
166173
}
167174
} catch (Throwable error) {
@@ -222,6 +229,10 @@ private String probeTracesEndpoint(String[] endpoints) {
222229
return V3_ENDPOINT;
223230
}
224231

232+
private void processInfoResponseHeaders(Response response) {
233+
ContainerInfo.get().setContainerTagsHash(response.header(DATADOG_CONTAINER_TAGS_HASH));
234+
}
235+
225236
@SuppressWarnings("unchecked")
226237
private boolean processInfoResponse(String response) {
227238
try {
@@ -295,11 +306,16 @@ private boolean processInfoResponse(String response) {
295306
|| Boolean.TRUE.equals(canDrop));
296307

297308
Object peer_tags = map.get("peer_tags");
298-
peerTags = peer_tags == null ? emptyList() : unmodifiableList((List<String>) peer_tags);
309+
peerTags =
310+
peer_tags instanceof List
311+
? unmodifiableSet(new HashSet<>((List<String>) peer_tags))
312+
: emptySet();
299313

300314
Object span_kinds = map.get("span_kinds_stats_computed");
301315
spanKindsToComputedStats =
302-
span_kinds == null ? emptyList() : unmodifiableList((List<String>) span_kinds);
316+
span_kinds instanceof List
317+
? unmodifiableSet(new HashSet<>((List<String>) span_kinds))
318+
: emptySet();
303319
}
304320
try {
305321
state = Strings.sha256(response);
@@ -357,11 +373,11 @@ public boolean supportsLongRunning() {
357373
return supportsLongRunning;
358374
}
359375

360-
public List<String> peerTags() {
376+
public Set<String> peerTags() {
361377
return peerTags;
362378
}
363379

364-
public List<String> spanKindsToComputedStats() {
380+
public Set<String> spanKindsToComputedStats() {
365381
return spanKindsToComputedStats;
366382
}
367383

‎communication/src/main/java/datadog/communication/http/OkHttpUtils.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ public final class OkHttpUtils {
4343
private static final String DATADOG_META_LANG_INTERPRETER = "Datadog-Meta-Lang-Interpreter";
4444
private static final String DATADOG_META_LANG_INTERPRETER_VENDOR =
4545
"Datadog-Meta-Lang-Interpreter-Vendor";
46-
private static final String DATADOG_CONTAINER_ID = "Datadog-Container-ID";
46+
public static final String DATADOG_CONTAINER_ID = "Datadog-Container-ID";
4747
private static final String DATADOG_ENTITY_ID = "Datadog-Entity-ID";
48+
public static final String DATADOG_CONTAINER_TAGS_HASH = "Datadog-Container-Tags-Hash";
4849

4950
private static final String DD_API_KEY = "DD-API-KEY";
5051

‎communication/src/test/groovy/datadog/communication/ddagent/DDAgentFeaturesDiscoveryTest.groovy‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package datadog.communication.ddagent
22

3+
import datadog.common.container.ContainerInfo
34
import datadog.communication.monitor.Monitoring
45
import datadog.trace.test.util.DDSpecification
56
import datadog.trace.util.Strings
67
import okhttp3.Call
8+
import okhttp3.Headers
79
import okhttp3.HttpUrl
810
import okhttp3.MediaType
911
import okhttp3.OkHttpClient
@@ -19,6 +21,8 @@ import java.nio.file.Paths
1921
import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V01_DATASTREAMS_ENDPOINT
2022
import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V6_METRICS_ENDPOINT
2123
import static datadog.communication.ddagent.DDAgentFeaturesDiscovery.V7_CONFIG_ENDPOINT
24+
import static datadog.communication.http.OkHttpUtils.DATADOG_CONTAINER_ID
25+
import static datadog.communication.http.OkHttpUtils.DATADOG_CONTAINER_TAGS_HASH
2226

2327
class DDAgentFeaturesDiscoveryTest extends DDSpecification {
2428

@@ -466,13 +470,37 @@ class DDAgentFeaturesDiscoveryTest extends DDSpecification {
466470
)
467471
}
468472

469-
def infoResponse(Request request, String json) {
473+
def "should send container id as header on the info request and parse the hash in the response"() {
474+
setup:
475+
OkHttpClient client = Mock(OkHttpClient)
476+
DDAgentFeaturesDiscovery features = new DDAgentFeaturesDiscovery(client, monitoring, agentUrl, true, true)
477+
def oldContainerId = ContainerInfo.get().getContainerId()
478+
def oldContainerTagsHash = ContainerInfo.get().getContainerTagsHash()
479+
ContainerInfo.get().setContainerId("test")
480+
481+
when: "/info requested"
482+
features.discover()
483+
484+
then:
485+
1 * client.newCall(_) >> { Request request ->
486+
assert request.header(DATADOG_CONTAINER_ID) == "test"
487+
infoResponse(request, INFO_RESPONSE, Headers.of(DATADOG_CONTAINER_TAGS_HASH, "test-hash"))
488+
}
489+
and:
490+
assert ContainerInfo.get().getContainerTagsHash() == "test-hash"
491+
cleanup:
492+
ContainerInfo.get().setContainerId(oldContainerId)
493+
ContainerInfo.get().setContainerTagsHash(oldContainerTagsHash)
494+
}
495+
496+
def infoResponse(Request request, String json, Headers headers = new Headers.Builder().build()) {
470497
return Mock(Call) {
471498
it.execute() >> new Response.Builder()
472499
.code(200)
473500
.request(request)
474501
.protocol(Protocol.HTTP_1_1)
475502
.message("")
503+
.headers(headers)
476504
.body(ResponseBody.create(MediaType.get("application/json"), json))
477505
.build()
478506
}

‎dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,19 @@ public static boolean canSkipClassLoaderByName(final ClassLoader loader) {
4242
case "org.codehaus.groovy.runtime.callsite.CallSiteClassLoader":
4343
case "sun.reflect.DelegatingClassLoader":
4444
case "jdk.internal.reflect.DelegatingClassLoader":
45+
case "org.jvnet.hk2.internal.DelegatingClassLoader":
4546
case "clojure.lang.DynamicClassLoader":
4647
case "org.apache.cxf.common.util.ASMHelper$TypeHelperClassLoader":
4748
case "com.ibm.xml.xlxp2.jaxb.codegen.AbstractGeneratedStubFactory$RootStubClassLoader":
4849
case "sun.misc.Launcher$ExtClassLoader":
50+
case "org.springframework.context.support.ContextTypeMatchClassLoader$ContextOverridingClassLoader":
51+
case "org.openjdk.nashorn.internal.runtime.ScriptLoader":
52+
case "jdk.nashorn.internal.runtime.ScriptLoader":
53+
case "org.codehaus.janino.ByteArrayClassLoader":
54+
case "org.eclipse.persistence.internal.jaxb.JaxbClassLoader":
55+
case "com.alibaba.fastjson.util.ASMClassLoader":
4956
case "datadog.trace.bootstrap.DatadogClassLoader":
57+
case "datadog.trace.bootstrap.InstrumentationClassLoader":
5058
return true;
5159
}
5260
if (CHECK_EXCLUDES) {

‎dd-java-agent/instrumentation/spring-webflux-6/build.gradle‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ dependencies {
5353
}
5454
bootTestImplementation project(':dd-java-agent:instrumentation:spring-webflux-5')
5555
// our default version of spock is too old
56-
bootTestImplementation group: 'org.spockframework', name: 'spock-core', version: '2.4-M1-groovy-3.0'
57-
bootTestImplementation group: 'org.spockframework', name: 'spock-junit4', version: '2.4-M1-groovy-3.0'
58-
bootTestImplementation group: 'org.spockframework', name: 'spock-spring', version: '2.4-M1-groovy-3.0'
56+
bootTestImplementation libs.bundles.spock24.spring
5957

6058
latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '3.+'
6159
latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.+', {
@@ -64,10 +62,7 @@ dependencies {
6462
}
6563
latestDepBootTestImplementation project(':dd-java-agent:instrumentation:spring-webflux-5')
6664
// our default version of spock is too old
67-
latestDepBootTestImplementation group: 'org.spockframework', name: 'spock-core', version: '2.4-M1-groovy-3.0'
68-
latestDepBootTestImplementation group: 'org.spockframework', name: 'spock-junit4', version: '2.4-M1-groovy-3.0'
69-
latestDepBootTestImplementation group: 'org.spockframework', name: 'spock-spring', version: '2.4-M1-groovy-3.0'
70-
65+
latestDepBootTestImplementation libs.bundles.spock24.spring
7166

7267
iastTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '3.0.0'
7368
iastTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-json', version: '3.0.0'
@@ -85,8 +80,6 @@ dependencies {
8580
iastTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-json', version: '3.0.0'
8681

8782
// our default version of spock is too old
88-
iastTestImplementation group: 'org.spockframework', name: 'spock-core', version: '2.4-M1-groovy-3.0'
89-
iastTestImplementation group: 'org.spockframework', name: 'spock-junit4', version: '2.4-M1-groovy-3.0'
90-
iastTestImplementation group: 'org.spockframework', name: 'spock-spring', version: '2.4-M1-groovy-3.0'
83+
iastTestImplementation libs.bundles.spock24.spring
9184
}
9285

‎dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpClientTest.groovy‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
293293
status == 200
294294
assertTraces(2) {
295295
trace(size(2)) {
296+
sortSpansByStart()
296297
basicSpan(it, "parent")
297298
clientSpan(it, span(0), method)
298299
}
@@ -439,6 +440,7 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
439440
// only one trace (client).
440441
assertTraces(1) {
441442
trace(size(2)) {
443+
sortSpansByStart()
442444
basicSpan(it, "parent")
443445
clientSpan(it, span(0), method, renameService)
444446
}
@@ -482,6 +484,7 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
482484
assertTraces(1) {
483485
sortSpansByStart()
484486
trace(size(3)) {
487+
sortSpansByStart()
485488
basicSpan(it, "parent")
486489
clientSpan(it, span(0), method)
487490
basicSpan(it, "child", span(0))
@@ -721,6 +724,7 @@ abstract class HttpClientTest extends VersionedNamingTestBase {
721724
def thrownException = ex instanceof ExecutionException ? ex.cause : ex
722725
assertTraces(1) {
723726
trace(size(2)) {
727+
sortSpansByStart()
724728
basicSpan(it, "parent", null, thrownException)
725729
clientSpan(it, span(0), method, false, false, uri, null, true, thrownException)
726730
}

0 commit comments

Comments
 (0)