Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions .claude/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"enabledMcpjsonServers": [
"datadog"
],
"enableAllProjectMcpServers": true
Comment on lines +2 to +5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💭 thought: ‏Do we want to have MCP? And more over, enabled by default?
They fill up the context pretty quick and are less effective than CLI or skills with commands.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried it out and I think it provides interesting tools for exploiting CI Visibility data. By default, our pipelines are reporting to CI Visibility. This MCP doesn't expose too many tools, so I don't think it overloads the context. I think it's a good improvement.

}
8 changes: 8 additions & 0 deletions .mcp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"mcpServers": {
"datadog": {
"type": "http",
"url": "https://mcp.datadoghq.com/api/unstable/mcp-server/mcp?toolsets=software-delivery"
}
}
}
21 changes: 21 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,24 @@ Code running in the agent's `premain` phase must **not** use:
- `javax.management.*` — causes class loading issues

See [docs/bootstrap_design_guidelines.md](docs/bootstrap_design_guidelines.md) for details and alternatives.

## Developer Tools

### MCP Tools

* Datadog MCP defaults: When using Datadog MCP tools (CI pipelines, tests, flaky tests, coverage, PR insights), default to the repository `github.com/DataDog/dd-trace-java` (or `https://github.com/DataDog/dd-trace-java` for PR-related tools) unless the user specifies a different repository. Use the current git branch and latest commit SHA as context when relevant.

### GitHub Tools

- When interacting with GitHub (github.com), ALWAYS use `gh` on the command line.
- If `gh` CLI is not installed or there are authentication or configuration problems, check the document: [AI Tools Integration Guide - GitHub CLI](docs/ai-tools-integration-guide.md#github-cli-gh)

### GitLab Tools

- When interacting with GitLab (gitlab.ddbuild.io), ALWAYS use `glab` on the command line.
- If `glab` CLI is not installed or there are authentication or configuration problems, check the document: [AI Tools Integration Guide - GitLab CLI](docs/ai-tools-integration-guide.md#gitlab-cli-glab)
Comment on lines +95 to +96
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❔ question: ‏Will this work for all contributors? Including the ones not from Datadog?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It won’t work outside the organization. I don’t see any issue with that. Even within the org, if you don’t have the CLI tool and/or the MCP configured, the AI will either suggest setting them up or tell you it can’t access the data you’re asking for.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don’t see any issue with that

We're Open Source software repository. That's not very welcoming to the community 😕


### Handling the Pull Request and CI

- If the request relates to CI status for a branch or PR, MUST ALWAYS try the Datadog MCP first.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 suggestion: ‏I would rather use the skill from the Datadog plugin (or even mine) rather than relying on an MCP.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Among other differences, the mcp server can be used by any client, and the claude marketplace is only for claude.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it's making Claude code, the recommended AI coded tool by the company so far, behaving significantly worse from experience with this repository. I would rather not have it enabled by default in such case.

What about using other tool hooks to setup their specific config for example?
That would leave the best experience for the default tool and allow others to setup their copies for specific tool if needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I completely agree that we should NOT enable the MCP server by default, and instead let developers opt in if they want to use it. (I will update the PR)

That said, I still believe the MCP server itself shouldn’t negatively impact the repository context, and I’d still lean towards using standard, vendor-neutral tooling whenever possible, rather than approaches that are tightly coupled to a specific provider.

- Use local GitLab/GitHub tools as a fallback/support for the Datadog MCP when interacting with GitLab/GitHub CI.
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ For IntelliJ IDEA, we suggest the following settings and plugin.
* Switch to `IntelliJ IDEA CE 2021.2.3`.
</details>

## AI-assisted development

This project includes documentation and configurations to help you use AI coding assistants effectively.

Check [AI Tools Integration Guide](docs/ai-tools-integration-guide.md) for information about:
* Project-specific AI context and conventions
* How to use AI tools with dd-trace-java
* Best practices for AI-assisted contributions

Comment on lines +84 to +92
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💭 thought: ‏Not sure we went to advocate for AI-assisted development on the repo.
It feels to early and 3rd party contributions already require a good amount of time to get merged.

## Pull request guidelines

### Draft first
Expand Down
160 changes: 160 additions & 0 deletions docs/ai-tools-integration-guide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
# AI Tools Integration Guide

> **Note**: This document is currently under development and will be populated with guidance on using AI coding assistants effectively with dd-trace-java.

## The AI tools

This section describes the AI tools and integrations available for dd-trace-java development.

**Index:**
- [MCP Servers Integration (Beta)](#mcp-servers-integration-beta)
- [Datadog MCP Server Setup](#datadog-mcp-server-setup-for-dd-trace-java)
- [Claude CLI](#claude-cli)
- [GitHub CLI (gh)](#github-cli-gh)
- [GitLab CLI (glab)](#gitlab-cli-glab)


### MCP Servers Integration (Beta)

Model Context Protocol (MCP) servers extend AI capabilities with specialized tools and integrations. The dd-trace-java repository provides several MCP server configurations to enhance your development workflow. MCP servers can be used with any compatible AI tool, including Cursor and Claude CLI.

**Available MCP Servers:**

- **Datadog MCP Server**: Provides CI Visibility integration including pipeline event search and aggregation, test event analysis, flaky test detection, code coverage summaries, and PR insights. Pre-configured in the repository via `.mcp.json` (for Claude CLI and other compatible tools). Cursor users need to set up `.cursor/mcp.json` manually (see setup instructions below).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❔ question: ‏What the benefits of this dedicated MCP compared to the datadog market place skills? It looks duplicate.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if any of the skills in the Datadog Claude Marketplace provide access to CI Visibility. In any case, I usually use Cursor, and I can't use Claude plugins in Cursor.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI Visibility is indeed supported from our plugin market place.


To set up MCP servers, follow the specific setup guides for each server. All MCP servers integrate seamlessly with compatible AI tools, providing enhanced context and capabilities for working with the dd-trace-java repository.

#### Datadog MCP Server Setup for dd-trace-java

The Datadog MCP server connects Cursor's/Claude AI assistant to Datadog's CI Visibility platform, letting you query pipeline events, test results, flaky tests, code coverage, and PR insights directly from the chat.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❔ question: ‏Is this configuration available for all contributors, even not from Datadog?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think anyone outside the organization can access our pipelines, let alone GitLab. But having the MCP configured by default won't affect development. If Claude or Cursor detect that the MCP isn't working, they'll try to use other mechanisms to resolve user queries.


##### Setup

**1. Repository Configuration**

The repository includes the MCP server configuration for Claude CLI and other compatible tools in `.mcp.json`:

```json
{
"mcpServers": {
"datadog": {
"type": "http",
"url": "https://mcp.datadoghq.com/api/unstable/mcp-server/mcp?toolsets=software-delivery"
}
}
}
```
Comment on lines +35 to +46
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❔ question: ‏What's the benefit of repeating what's already in VCS?


For **Cursor** users, the `.cursor/` directory is not tracked in git. Create the file `.cursor/mcp.json` manually with the following content:

```json
{
"mcpServers": {
"datadog": {
"url": "https://mcp.datadoghq.com/api/unstable/mcp-server/mcp?toolsets=software-delivery",
"headers": {}
}
}
}
```

**2. Authentication via SSO**

The Datadog MCP server uses SSO for authentication. No API or App keys are required.

1. Open your AI tool in the dd-trace-java repository
2. Trigger the **login** command on the `datadog` MCP server:
- **Cursor**: Go to the MCP settings panel and trigger the login command. For the in-terminal agent use `/mcp login`.
- **Claude CLI**: Run `/mcp` to see server status, then follow the login prompt.
3. A browser tab opens automatically for Datadog SSO login
4. Complete the login in your browser — the tool picks up the session automatically

After logging in, the MCP tools are immediately available in the AI chat.

##### Available Tools

The repository configuration enables the **software-delivery** toolset. See the [official Datadog MCP toolsets documentation](https://docs.datadoghq.com/bits_ai/mcp_server/#toolsets:~:text=MCP%20Server.-,Toolsets,-The%20Datadog%20MCP) for the full list of available tools.

##### Example Prompts

```
Show me the latest failed CI jobs on the main branch of DataDog/dd-trace-java
```

```
Find the top 10 flaky tests in dd-trace-java sorted by failure rate
```

```
What issues are blocking PR #1234 in DataDog/dd-trace-java?
```

```
What's the P95 pipeline duration for dd-trace-java over the last 30 days?
```

### Claude CLI

The dd-trace-java repository provides native support for **Claude CLI** (Anthropic's command-line interface for Claude) through a dedicated configuration in the `.claude/` directory.

#### Configuration Files

```
.claude/
├── CLAUDE.md # Claude-specific instructions and rules pointer
├── settings.json # Claude CLI settings (permissions, environment, MCP enablement)

.mcp.json # MCP server configuration (shared across AI tools)
```

* **`.claude/CLAUDE.md`**: Contains Claude-specific instructions and points to the shared rules in `AGENTS.md`
* **`.claude/settings.json`**: Configures Claude CLI behavior, including default permission mode, environment variables, and MCP server enablement (e.g., the Datadog MCP server)
* **`.mcp.json`**: Defines MCP server connections at the repository root. Claude CLI automatically discovers this file and makes the configured servers available. Currently includes the Datadog MCP server for CI Visibility integration

### GitHub CLI (gh)

The AI tools are configured to use the **GitHub CLI** (`gh`) for all interactions with GitHub (github.com), including repository management, pull requests, issues, and CI/CD operations. The AI assistant will automatically use `gh` commands when performing GitHub-related tasks.

#### Installation

```bash
brew install gh
```
Comment on lines +120 to +122
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 notes: If we start requiring some new tools, we will need to provide installation documentation for all operating systems and configuration.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right, I guess the solution would be to link to the GitHub or GitLab page where the installation is detailed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We detailed installation process from our documentation rather than sending to the application page.
Check https://github.com/DataDog/dd-trace-java/blob/master/BUILDING.md for example.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in this case we may be talking about slightly different things. The build process is a core part of the project and usually involves project-specific configuration, so it makes sense to document it in detail.

For the GitHub and GitLab CLIs, there isn’t really any repo-specific setup required. That’s why I’m not sure it’s worth detailing the whole process here. In my view, linking to the official installation pages should be sufficient, and we can always expand the docs later if we find people are getting stuck.


#### Authentication

```bash
gh auth login
```

To verify your authentication status:

```bash
gh auth status
```

### GitLab CLI (glab)

The AI tools are configured to use the **GitLab CLI** (`glab`) for all interactions with GitLab (gitlab.ddbuild.io), including pipeline management, merge requests, and CI/CD operations. The AI assistant will automatically use `glab` commands when performing GitLab-related tasks.

#### Installation

```bash
brew install glab
```

#### Authentication

You will need a **personal access token** to authenticate with GitLab. You can create one from your GitLab profile at **Settings > Access Tokens** on `gitlab.ddbuild.io`.

Once you have your token, authenticate:

```bash
glab auth login --hostname gitlab.ddbuild.io
```

To set the default host:

```bash
glab config set host gitlab.ddbuild.io
```