Skip to content

Implement telemetry for shell git commands #6665

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
Feb 13, 2024
Merged

Implement telemetry for shell git commands #6665

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
1 change: 1 addition & 0 deletions dd-java-agent/agent-ci-visibility/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ excludedClassesCoverage += [
"datadog.trace.civisibility.utils.ProcessHierarchyUtils",
"datadog.trace.civisibility.utils.ShellCommandExecutor",
"datadog.trace.civisibility.utils.ShellCommandExecutor.OutputParser",
"datadog.trace.civisibility.utils.ShellCommandExecutor.ShellCommandFailedException",
"datadog.trace.civisibility.utils.SpanUtils"
]

Expand Down
10 changes: 8 additions & 2 deletions ...nt/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import datadog.communication.ddagent.SharedCommunicationObjects;
import datadog.trace.api.Config;
import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
import datadog.trace.api.git.GitInfoProvider;
import datadog.trace.civisibility.ci.CIProviderInfoFactory;
import datadog.trace.civisibility.communication.BackendApi;
Expand Down Expand Up @@ -42,6 +43,7 @@ public class CiVisibilityServices {
private static final String GIT_FOLDER_NAME = ".git";

final Config config;
final CiVisibilityMetricCollector metricCollector;
final BackendApi backendApi;
final JvmInfoFactory jvmInfoFactory;
final CIProviderInfoFactory ciProviderInfoFactory;
Expand All @@ -53,11 +55,15 @@ public class CiVisibilityServices {
@Nullable final SignalClient.Factory signalClientFactory;

CiVisibilityServices(
Config config, SharedCommunicationObjects sco, GitInfoProvider gitInfoProvider) {
Config config,
CiVisibilityMetricCollector metricCollector,
SharedCommunicationObjects sco,
GitInfoProvider gitInfoProvider) {
this.config = config;
this.metricCollector = metricCollector;
this.backendApi = new BackendApiFactory(config, sco).createBackendApi();
this.jvmInfoFactory = new CachingJvmInfoFactory(config, new JvmInfoFactoryImpl());
this.gitClientFactory = new GitClient.Factory(config);
this.gitClientFactory = new GitClient.Factory(config, metricCollector);
this.ciProviderInfoFactory = new CIProviderInfoFactory(config);
this.methodLinesResolver =
new BestEffortMethodLinesResolver(
Expand Down
12 changes: 11 additions & 1 deletion ...gent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import datadog.trace.api.civisibility.coverage.CoverageDataSupplier;
import datadog.trace.api.civisibility.events.BuildEventsHandler;
import datadog.trace.api.civisibility.events.TestEventsHandler;
import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
import datadog.trace.api.civisibility.telemetry.NoOpMetricCollector;
import datadog.trace.api.git.GitInfoProvider;
import datadog.trace.civisibility.config.JvmInfo;
import datadog.trace.civisibility.coverage.instrumentation.CoverageClassTransformer;
Expand All @@ -19,6 +21,7 @@
import datadog.trace.civisibility.events.BuildEventsHandlerImpl;
import datadog.trace.civisibility.events.TestEventsHandlerImpl;
import datadog.trace.civisibility.ipc.SignalServer;
import datadog.trace.civisibility.telemetry.CiVisibilityMetricCollectorImpl;
import datadog.trace.civisibility.utils.ProcessHierarchyUtils;
import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
import java.lang.instrument.Instrumentation;
Expand Down Expand Up @@ -53,7 +56,14 @@ public static void start(Instrumentation inst, SharedCommunicationObjects sco) {

sco.createRemaining(config);

CiVisibilityServices services = new CiVisibilityServices(config, sco, GitInfoProvider.INSTANCE);
CiVisibilityMetricCollector metricCollector =
config.isCiVisibilityTelemetryEnabled()
? new CiVisibilityMetricCollectorImpl()
: NoOpMetricCollector.INSTANCE;
InstrumentationBridge.registerMetricCollector(metricCollector);

CiVisibilityServices services =
new CiVisibilityServices(config, metricCollector, sco, GitInfoProvider.INSTANCE);

InstrumentationBridge.registerBuildEventsHandlerFactory(buildEventsHandlerFactory(services));
CIVisibility.registerSessionFactory(apiSessionFactory(services));
Expand Down
Loading