Skip to content

Add User-Agent to docker client #7407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Add User-Agent to docker client #7407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions core/src/main/java/org/testcontainers/DockerClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,13 @@ public class DockerClientFactory {

public static final String SESSION_ID = UUID.randomUUID().toString();

public static final String TESTCONTAINERS_VERSION =
DockerClientFactory.class.getPackage().getImplementationVersion();

public static final Map<String, String> DEFAULT_LABELS = markerLabels();

static Map<String, String> markerLabels() {
String implementationVersion = DockerClientFactory.class.getPackage().getImplementationVersion();
String testcontainersVersion = implementationVersion == null ? "unspecified" : implementationVersion;
String testcontainersVersion = TESTCONTAINERS_VERSION == null ? "unspecified" : TESTCONTAINERS_VERSION;

Map<String, String> labels = new HashMap<>();
labels.put(TESTCONTAINERS_LABEL, "true");
Expand Down
12 changes: 7 additions & 5 deletions core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@
import java.security.UnrecoverableKeyException;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
Expand Down Expand Up @@ -408,14 +409,15 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_32);
}
Map<String, String> headers = new HashMap<>();
headers.put("x-tc-sid", DockerClientFactory.SESSION_ID);
headers.put("User-Agent", String.format("tc-java/%s", DockerClientFactory.TESTCONTAINERS_VERSION));

return DockerClientImpl.getInstance(
new AuthDelegatingDockerClientConfig(
configBuilder.withDockerHost(transportConfig.getDockerHost().toString()).build()
),
new HeadersAddingDockerHttpClient(
dockerHttpClient,
Collections.singletonMap("x-tc-sid", DockerClientFactory.SESSION_ID)
)
new HeadersAddingDockerHttpClient(dockerHttpClient, headers)
);
}

Expand Down