Skip to content

Commit 5a70635

Browse files
Revert HTTP client sharing in CI Vis components (#7734)
1 parent 01f1505 commit 5a70635

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

communication/src/main/java/datadog/communication/BackendApiFactory.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
import datadog.communication.ddagent.DDAgentFeaturesDiscovery;
44
import datadog.communication.ddagent.SharedCommunicationObjects;
55
import datadog.communication.http.HttpRetryPolicy;
6+
import datadog.communication.http.OkHttpUtils;
67
import datadog.trace.api.Config;
78
import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
89
import java.util.function.Function;
910
import javax.annotation.Nullable;
1011
import okhttp3.HttpUrl;
12+
import okhttp3.OkHttpClient;
1113
import org.slf4j.Logger;
1214
import org.slf4j.LoggerFactory;
1315

@@ -34,13 +36,10 @@ public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommuni
3436
"Agentless mode is enabled and api key is not set. Please set application key");
3537
}
3638
String traceId = config.getIdGenerationStrategy().generateTraceId().toString();
37-
return new IntakeApi(
38-
agentlessUrl,
39-
apiKey,
40-
traceId,
41-
retryPolicyFactory,
42-
sharedCommunicationObjects.okHttpClient,
43-
true);
39+
OkHttpClient httpClient =
40+
OkHttpUtils.buildHttpClient(
41+
agentlessUrl, config.getCiVisibilityBackendApiTimeoutMillis());
42+
return new IntakeApi(agentlessUrl, apiKey, traceId, retryPolicyFactory, httpClient, true);
4443
}
4544

4645
DDAgentFeaturesDiscovery featuresDiscovery =

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,11 @@ public void createRemaining(Config config) {
3636
}
3737
}
3838
if (okHttpClient == null) {
39-
String unixDomainSocket;
40-
String namedPipe;
41-
HttpUrl url;
42-
if (!config.isCiVisibilityAgentlessEnabled()) {
43-
unixDomainSocket = SocketUtils.discoverApmSocket(config);
44-
namedPipe = config.getAgentNamedPipe();
45-
url = agentUrl;
46-
} else {
47-
unixDomainSocket = null;
48-
namedPipe = null;
49-
url = null;
50-
}
39+
String unixDomainSocket = SocketUtils.discoverApmSocket(config);
40+
String namedPipe = config.getAgentNamedPipe();
5141
okHttpClient =
5242
OkHttpUtils.buildHttpClient(
53-
url, unixDomainSocket, namedPipe, getHttpClientTimeout(config));
43+
agentUrl, unixDomainSocket, namedPipe, getHttpClientTimeout(config));
5444
}
5545
}
5646

dd-trace-core/src/main/java/datadog/trace/common/writer/WriterFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ private static RemoteApi createDDIntakeRemoteApi(
188188
}
189189
return DDIntakeApi.builder()
190190
.hostUrl(hostUrl)
191-
.httpClient(commObjects.okHttpClient)
192191
.apiKey(config.getApiKey())
193192
.trackType(trackType)
194193
.build();

0 commit comments

Comments
 (0)