Skip to content

Commit 0134ed4

Browse files
mhliddmhlidd
authored
Merge branch 'master' into mhlidd/update_quarkus_path
2 parents 5f9d0bf + 2a6801e commit 0134ed4

16 files changed

Lines changed: 119 additions & 15 deletions

File tree

‎.gitlab/one-pipeline.locked.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DO NOT EDIT THIS FILE MANUALLY
22
# This file is auto-generated by automation.
33
include:
4-
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/c1b0ca9f8f9dd222d3e2a5edf8c03db38d85f099189c5647983b27147fadd47c/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/c6ea92df19738f28d6e7c3e4fea86d030fa801ac3361427d6acb6f99a917c28a/one-pipeline.yml

‎buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzleVersionUtils.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ internal object MuzzleVersionUtils {
5757
v.contains("public_draft") ||
5858
v.contains("-cr") ||
5959
v.contains("-preview") ||
60+
v.contains(".redhat-") || // redhat releases often cause ArtifactNotFoundException
6061
skipVersions.contains(v) ||
6162
END_NMN_PATTERN.matches(v) ||
6263
GIT_SHA_PATTERN.matches(v))

‎communication/src/main/java/datadog/communication/serialization/FlushingBuffer.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ public boolean isDirty() {
2727

2828
@Override
2929
public void mark() {
30-
mark = buffer.position();
31-
++messageCount;
30+
int current = buffer.position();
31+
if (current != mark) {
32+
// count only non-empty messages
33+
++messageCount;
34+
mark = current;
35+
}
3236
}
3337

3438
@Override
@@ -101,4 +105,9 @@ public void reset() {
101105
buffer.limit(buffer.capacity());
102106
mark = 0;
103107
}
108+
109+
// for tests only
110+
int getMessageCount() {
111+
return messageCount;
112+
}
104113
}

‎communication/src/test/groovy/datadog/communication/serialization/FlushingBufferTest.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,45 @@ public class FlushingBufferTest {
1010
public void testBufferCapacity() {
1111
assertEquals(5, new FlushingBuffer(5, (messageCount, buffer) -> {}).capacity());
1212
}
13+
14+
@Test
15+
public void testMessageCount() {
16+
FlushingBuffer fb = new FlushingBuffer(10, (messageCount, buffer) -> {});
17+
18+
// initial counter
19+
assertEquals(0, fb.getMessageCount());
20+
21+
fb.mark();
22+
fb.mark();
23+
24+
// counter doesn't change if no data pushed into the buffer
25+
assertEquals(0, fb.getMessageCount());
26+
27+
fb.put((byte) 1);
28+
// still zero because the message counter increases on mark
29+
assertEquals(0, fb.getMessageCount());
30+
31+
fb.mark();
32+
// expect increased message counter
33+
assertEquals(1, fb.getMessageCount());
34+
35+
fb.mark();
36+
fb.mark();
37+
// no change to the counter expected for consecutive mark calls
38+
39+
fb.putChar('a');
40+
fb.putChar('b');
41+
fb.putChar('c');
42+
// no change to the message counter expected before mark call
43+
assertEquals(1, fb.getMessageCount());
44+
45+
fb.mark();
46+
// expect increased message counter
47+
assertEquals(2, fb.getMessageCount());
48+
49+
fb.mark();
50+
fb.mark();
51+
// no change to the counter expected for consecutive mark calls
52+
assertEquals(2, fb.getMessageCount());
53+
}
1354
}

‎dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ muzzle {
1010
group = "org.apache.httpcomponents"
1111
module = "httpclient"
1212
versions = "[4.0,5)"
13-
skipVersions += "4.3.6" // missing httpcore-4.3.3.redhat-3.jar at https://maven.repository.redhat.com/ga/org/apache/httpcomponents/httpcore/4.3.3.redhat-3/
1413
assertInverse = true
1514
}
1615
pass {

‎dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0.4/build.gradle‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ apply from: "$rootDir/gradle/java.gradle"
1212
addTestSuiteForDir("latestDepTest", "test")
1313
addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
1414

15+
// Exclude servlet 3.x API (coming from dd-java-agent:testing) to ensure servlet 2.x instrumentation applies.
16+
// Using testRuntimeClasspath instead of testImplementation because exclusions on testImplementation
17+
// propagate to latestDep* configurations, which need servlet 3.1 API for Jetty 9.2.x.
18+
configurations.testRuntimeClasspath {
19+
exclude group: 'javax.servlet', module: 'javax.servlet-api'
20+
}
21+
1522
dependencies {
1623
implementation project(':dd-java-agent:instrumentation:jetty:jetty-common')
1724
implementation project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0")
@@ -35,6 +42,8 @@ dependencies {
3542
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3')
3643
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2')
3744

45+
// latestDep tests use Jetty 9.2.x which requires servlet 3.1 API
46+
latestDepTestImplementation group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
3847
latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.2.30.v20200428'
3948
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.+'
4049
latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.2.+'

dd-java-agent/instrumentation/mail/build.gradle renamed to dd-java-agent/instrumentation/mail/javax-mail-1.4.4/build.gradle

File renamed without changes.

dd-java-agent/instrumentation/mail/gradle.lockfile renamed to dd-java-agent/instrumentation/mail/javax-mail-1.4.4/gradle.lockfile

File renamed without changes.

dd-java-agent/instrumentation/mail/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailInstrumentation.java renamed to dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/mail/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailPartInstrumentation.java renamed to dd-java-agent/instrumentation/mail/javax-mail-1.4.4/src/main/java/datadog/trace/instrumentation/javax/mail/JavaxMailPartInstrumentation.java

File renamed without changes.

0 commit comments

Comments
 (0)