Skip to content

Commit d8d553e

Browse files
dougqhdougqh
authored
Merge branch 'master' into dougqh/cache-tracer-host
2 parents 29f5205 + a1239d3 commit d8d553e

47 files changed

Lines changed: 1342 additions & 166 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/dependabot.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
labels:
8+
- 'comp: tooling'
9+
- 'tag: dependencies'
10+
- 'tag: no release notes'
11+
commit-message:
12+
prefix: 'chore(ci): '
13+
groups:
14+
gh-actions-packages:
15+
patterns:
16+
- '*'
17+
cooldown:
18+
default-days: 14
19+
- package-ecosystem: gradle
20+
directory: /
21+
schedule:
22+
interval: weekly
23+
allow:
24+
- dependency-name: gradle
25+
ignore:
26+
- dependency-name: gradle
27+
update-types:
28+
- version-update:semver-major
29+
labels:
30+
- 'comp: tooling'
31+
- 'tag: dependencies'
32+
- 'tag: no release notes'
33+
commit-message:
34+
prefix: 'chore(build): '
35+
cooldown:
36+
default-days: 14

‎.github/dependabot.yml.disabled‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎.github/workflows/create-release-branch.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
run: |
120120
git config user.name "github-actions[bot]"
121121
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
122-
git commit -m "chore: Pin system-tests for release branch" .github/workflows/run-system-tests.yaml
122+
git commit -m "chore: Pin system-tests for release branch" .github/workflows/run-system-tests.yaml .gitlab-ci.yml
123123
echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
124124
125125
- name: Push changes

‎.github/workflows/run-system-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
needs:
6363
- build
6464
# If you change the following comment, update the pattern in the update_system_test_reference.sh script to match.
65-
uses: DataDog/system-tests/.github/workflows/system-tests.yml@main # system tests are pinned for releases only
65+
uses: DataDog/system-tests/.github/workflows/system-tests.yml@main # system tests are pinned on release branches only
6666
secrets:
6767
TEST_OPTIMIZATION_API_KEY: ${{ secrets.DATADOG_API_KEY_PROD }}
6868
permissions:
@@ -72,7 +72,7 @@ jobs:
7272
with:
7373
library: java
7474
# If you change the following comment, update the pattern in the update_system_test_reference.sh script to match.
75-
ref: main # system tests are pinned for releases only
75+
ref: main # system tests are pinned on release branches only
7676
binaries_artifact: binaries
7777
desired_execution_time: 900 # 15 minutes
7878
scenarios_groups: tracer-release

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ muzzle-dep-report:
647647
CI_USE_TEST_AGENT: "true"
648648
CI_AGENT_HOST: local-agent
649649
services:
650-
- name: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.33.1
650+
- name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.44.0
651651
alias: local-agent
652652
variables:
653653
LOG_LEVEL: "DEBUG"
@@ -1071,6 +1071,7 @@ publishing-gate:
10711071

10721072
configure_system_tests:
10731073
variables:
1074+
SYSTEM_TESTS_REF: main # system tests are pinned on release branches only
10741075
SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,simple_onboarding_appsec,docker-ssi,lib-injection"
10751076

10761077
create_key:

‎.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/f14ac28614630d12bcfe6cba4fd8d72dce142c62ff0b053ba7c323622104ebd7/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/9cf7d7609ff62e4723c9cbc061ca2a25345ce5d6055b9acad9a13dbf736261f0/one-pipeline.yml

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import static datadog.trace.util.AgentThreadFactory.AGENT_THREAD_GROUP;
55

66
import datadog.common.container.ContainerInfo;
7-
import datadog.common.socket.SocketUtils;
87
import datadog.communication.http.OkHttpUtils;
8+
import datadog.communication.http.SocketUtils;
99
import datadog.metrics.api.Monitoring;
1010
import datadog.remoteconfig.ConfigurationPoller;
1111
import datadog.remoteconfig.DefaultConfigurationPoller;

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.communication.http;
22

3-
import static datadog.common.socket.SocketUtils.discoverApmSocket;
3+
import static datadog.communication.http.SocketUtils.discoverApmSocket;
44
import static java.util.concurrent.TimeUnit.MILLISECONDS;
55
import static java.util.concurrent.TimeUnit.SECONDS;
66

@@ -68,6 +68,7 @@ public static OkHttpClient buildHttpClient(
6868
final long timeoutMillis) {
6969
return buildHttpClient(
7070
unixDomainSocketPath,
71+
Config.get().isJdkSocketEnabled(),
7172
namedPipe,
7273
null,
7374
isHttp,
@@ -77,7 +78,8 @@ public static OkHttpClient buildHttpClient(
7778
null,
7879
null,
7980
null,
80-
timeoutMillis);
81+
timeoutMillis,
82+
Config.get().isAgentConfiguredUsingDefault());
8183
}
8284

8385
public static OkHttpClient buildHttpClient(
@@ -93,6 +95,7 @@ public static OkHttpClient buildHttpClient(
9395
final long timeoutMillis) {
9496
return buildHttpClient(
9597
discoverApmSocket(config),
98+
config.isJdkSocketEnabled(),
9699
config.getAgentNamedPipe(),
97100
dispatcher,
98101
isPlainHttp(url),
@@ -102,13 +105,15 @@ public static OkHttpClient buildHttpClient(
102105
proxyPort,
103106
proxyUsername,
104107
proxyPassword,
105-
timeoutMillis);
108+
timeoutMillis,
109+
config.isAgentConfiguredUsingDefault());
106110
}
107111

108112
public abstract static class CustomListener extends EventListener {}
109113

110114
private static OkHttpClient buildHttpClient(
111115
final String unixDomainSocketPath,
116+
final boolean useJdkUnixDomainSocket,
112117
final String namedPipe,
113118
final Dispatcher dispatcher,
114119
final boolean isHttp,
@@ -118,7 +123,8 @@ private static OkHttpClient buildHttpClient(
118123
final Integer proxyPort,
119124
final String proxyUsername,
120125
final String proxyPassword,
121-
final long timeoutMillis) {
126+
final long timeoutMillis,
127+
final boolean agentConfiguredUsingDefault) {
122128
final OkHttpClient.Builder builder = new OkHttpClient.Builder();
123129

124130
try {
@@ -144,7 +150,9 @@ private static OkHttpClient buildHttpClient(
144150
dispatcher != null ? dispatcher : new Dispatcher(RejectingExecutorService.INSTANCE));
145151

146152
if (unixDomainSocketPath != null) {
147-
builder.socketFactory(new UnixDomainSocketFactory(new File(unixDomainSocketPath)));
153+
builder.socketFactory(
154+
new UnixDomainSocketFactory(
155+
new File(unixDomainSocketPath), useJdkUnixDomainSocket, agentConfiguredUsingDefault));
148156
log.debug("Using UnixDomainSocket as http transport");
149157
} else if (namedPipe != null) {
150158
builder.socketFactory(new NamedPipeSocketFactory(namedPipe));

utils/socket-utils/src/main/java/datadog/common/socket/SocketUtils.java renamed to communication/src/main/java/datadog/communication/http/SocketUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.common.socket;
1+
package datadog.communication.http;
22

33
import static datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_SOCKET_PATH;
44

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,18 @@ public GrowableBuffer(int initialCapacity) {
1717
this.buffer = ByteBuffer.allocate(initialCapacity);
1818
}
1919

20+
/** Flips the buffer and returns a new slice which shares the buffered content. */
2021
public ByteBuffer slice() {
2122
buffer.flip();
2223
return buffer.slice();
2324
}
2425

26+
/** Flips the buffer and returns the buffered content. */
27+
public ByteBuffer flip() {
28+
buffer.flip();
29+
return buffer;
30+
}
31+
2532
public int messageCount() {
2633
return messageCount;
2734
}

0 commit comments

Comments
 (0)