Skip to content

Commit 7e7637f

Browse files
daniel-mohedanodaniel-mohedano
authored
Merge branch 'master' into daniel.mohedano/final-status
2 parents 3166db1 + d10055d commit 7e7637f

203 files changed

Lines changed: 6043 additions & 1558 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/pull_request_template.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66

77
# Contributor Checklist
88

9-
- Format the title [according the contribution guidelines](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#title-format)
10-
- Assign the `type:` and (`comp:` or `inst:`) labels in addition to [any useful labels](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#labels)
11-
- Don't use `close`, `fix` or any [linking keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) when referencing an issue.
9+
- Format the title according to [the contribution guidelines](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#title-format)
10+
- Assign the `type:` and (`comp:` or `inst:`) labels in addition to [any other useful labels](https://github.com/DataDog/dd-trace-java/blob/master/CONTRIBUTING.md#labels)
11+
- Avoid using `close`, `fix`, or [any linking keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) when referencing an issue
1212
Use `solves` instead, and assign the PR [milestone](https://github.com/DataDog/dd-trace-java/milestones) to the issue
13-
- Update the [CODEOWNERS](https://github.com/DataDog/dd-trace-java/blob/master/.github/CODEOWNERS) file on source file addition, move, or deletion
14-
- Update the [public documentation](https://docs.datadoghq.com/tracing/trace_collection/library_config/java/) in case of new configuration flag or behavior
13+
- Update the [CODEOWNERS](https://github.com/DataDog/dd-trace-java/blob/master/.github/CODEOWNERS) file on source file addition, migration, or deletion
14+
- Update [public documentation](https://docs.datadoghq.com/tracing/trace_collection/library_config/java/) with any new configuration flags or behaviors
1515

1616
Jira ticket: [PROJ-IDENT]
1717

18+
***Note:*** **Once your PR is ready to merge, add it to the merge queue by commenting `/merge`.** `/merge -c` cancels the queue request. `/merge -f --reason "reason"` skips all merge queue checks; please use this judiciously, as some checks do not run at the PR-level. For more information, see [this doc](https://datadoghq.atlassian.net/wiki/spaces/DEVX/pages/3121612126/MergeQueue).
19+
1820
<!--
1921
# Opening vs Drafting a PR:
2022
When opening a pull request, please open it as a draft to not auto assign reviewers before you feel the pull request is in a reviewable state.

‎.github/workflows/check-pull-request-labels.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
'inst:',
3232
'tag:',
3333
'mergequeue-status:',
34+
'team:',
3435
'performance:', // To refactor to 'ci: ' in the future
3536
'run-tests:' // Unused since GitLab migration
3637
]
@@ -55,7 +56,7 @@ jobs:
5556
'**This PR is blocked until:**\n' +
5657
'1. The invalid labels are deleted, and\n' +
5758
'2. A maintainer deletes this comment to unblock the PR\n\n' +
58-
'**Note:** Simply removing labels from the pull request is not enough - a maintainer must remove the label and delete this comment to remove the block.\n\n' +
59+
'**Note:** Simply removing labels from the pull request is not enough - a maintainer must delete this comment then remove the label to remove the block.\n\n' +
5960
commentMarker
6061
6162
if (blockingComment) {
@@ -79,5 +80,9 @@ jobs:
7980
}
8081
if (blockingComment) {
8182
// Block the PR by failing the workflow
82-
core.setFailed(`PR blocked: Invalid labels detected: (${invalidLabels.join(', ')}). A maintainer must delete the blocking comment after fixing the labels to allow merging.`)
83+
if (hasInvalidLabels) {
84+
core.setFailed(`PR blocked: Invalid labels detected: (${invalidLabels.join(', ')}). A maintainer must delete the blocking comment after fixing the labels to allow merging.`)
85+
} else {
86+
core.setFailed(`PR blocked: A previous blocking comment still exists. A maintainer must delete it to allow merging.`)
87+
}
8388
}

‎.gitlab/collect_results.sh‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ function get_source_file () {
2626
class="${RESULT_XML_FILE%.xml}"
2727
class="${class##*"TEST-"}"
2828
class="${class##*"."}"
29-
# Extract the inner class name if there's a "$"
30-
if [[ "$class" == *"$"* ]]; then
31-
class="${class##*"$"}"
32-
fi
29+
class="${class##*"$"}" # remove inner class name if it exists
3330
set +e # allow grep to fail
3431
common_root=$(grep -rl "class $class\|static class $class" "$file_path" 2>/dev/null | head -n 1)
3532
set -e
@@ -39,14 +36,19 @@ function get_source_file () {
3936
while [[ $line != "$common_root"* ]]; do
4037
common_root=$(dirname "$common_root")
4138
if [[ "$common_root" == "$common_root/.." ]] || [[ "$common_root" == "/" ]]; then
39+
common_root=""
4240
break
4341
fi
4442
done
4543
done < <(grep -rl "class $class\|static class $class" "$file_path" 2>/dev/null)
4644

47-
if [[ -n "$common_root" ]] && [[ "$common_root" != "/" ]]; then
45+
if [[ -n "$common_root" && "$common_root" != "/" ]]; then
4846
file_path="/$common_root"
47+
else
48+
file_path="UNKNOWN"
4949
fi
50+
else
51+
file_path="UNKNOWN"
5052
fi
5153
fi
5254
}

‎.gitlab/exploration-tests.yml‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,25 @@ build-exploration-tests-image:
4444
- "*_surefire-reports.tar.gz"
4545
- "*_debugger-dumps.tar.gz"
4646

47-
# TODO fix them
48-
# exploration-tests-method-jsoup:
49-
# needs: [ build ]
50-
# dependencies:
51-
# - build
52-
# <<: *common-exploration-tests
53-
# variables:
54-
# PROJECT: jsoup
55-
# script:
56-
# - ./run-exploration-tests.sh "method" "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
57-
#
58-
# exploration-tests-line-jsoup:
59-
# needs: [ build ]
60-
# dependencies:
61-
# - build
62-
# <<: *common-exploration-tests
63-
# variables:
64-
# PROJECT: jsoup
65-
# script:
66-
# - ./run-exploration-tests.sh "line" "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
47+
exploration-tests-method-jsoup:
48+
needs: [ build ]
49+
dependencies:
50+
- build
51+
<<: *common-exploration-tests
52+
variables:
53+
PROJECT: jsoup
54+
script:
55+
- ./run-exploration-tests.sh "method" "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
56+
57+
exploration-tests-line-jsoup:
58+
needs: [ build ]
59+
dependencies:
60+
- build
61+
<<: *common-exploration-tests
62+
variables:
63+
PROJECT: jsoup
64+
script:
65+
- ./run-exploration-tests.sh "line" "$PROJECT" "mvn verify" "include_${PROJECT}.txt" "exclude_${PROJECT}.txt"
6766

6867
exploration-tests-method-jackson-core:
6968
needs: [ build ]

‎BUILDING.md‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This documentation provides information for developers to set up their environme
1616

1717
### Quick check
1818

19-
To check that your development environment is properly set up to build the project, from the project root run on macOS or Linux:
19+
To check that your development environment is properly set up to build the project, run the following command from the project root on macOS or Linux:
2020
```shell
2121
./setup.sh
2222
```
@@ -54,40 +54,40 @@ If there is any issue with your output, check the requirements below and use the
5454

5555
Requirements to build the full project:
5656

57-
* A recent version (21+) of JDK,
58-
* The `git` command line must be installed,
59-
* A container runtime environment must be available to run all tests (e.g. Docker Desktop).
57+
* JDK version is 21+,
58+
* The `git` command line is installed,
59+
* A container runtime environment is available to run all tests (e.g. Docker Desktop).
6060

6161
### Install JDK
6262

6363
Java is required to run Gradle, the project build tool.
64-
Gradle will find any locally installed JDK and can download any missing JDK versions needed for the project build and testing.
64+
Gradle will find any locally installed JDK and download any missing JDK versions needed for the project build and testing.
6565

6666
#### macOS
6767

68-
Install a recent (21+) JDK using `brew`:
68+
Install JDK 21 using `brew`:
6969
```shell
7070
brew install --cask zulu@21
7171
```
7272

7373
#### Linux
7474

75-
Use your distribution package manager to install a recent (21+) JDK:
75+
Use your distribution package manager to install JDK 21:
7676
```shell
7777
apt install openjdk-21-jdk
7878
```
79-
Alternatively, manually download and install it from [Eclipse Temurin releases](https://adoptium.net/temurin/releases/).
79+
Alternatively, manually download and install from [Eclipse Temurin releases](https://adoptium.net/temurin/releases/).
8080

8181
Add the `JAVA_HOME` environment variable to your shell using the `export` command.
8282
You can permanently set it by appending the `export` command to your shell configuration file such as `~/.zshrc`, `~/.bashrc` or similar.
8383
```shell
8484
export JAVA_HOME=/<path to extracted archive>/jdk-21.x.x
8585
```
86-
Restart your shell after applying the changes if you appended the commands to your shell configuration file.
86+
If you appended the commands to your shell configuration file, restart your shell after applying the changes.
8787

8888
#### Windows
8989

90-
Install a recent (21+) JDK using the Windows package manager `winget`:
90+
Install JDK 21 using the Windows package manager `winget`:
9191
```pwsh
9292
winget install --id EclipseAdoptium.Temurin.21.JDK
9393
```
@@ -114,7 +114,7 @@ apt install git
114114

115115
#### Windows
116116

117-
Download and install the installer from [the official website](https://git-scm.com/download/win) or install it using the Windows package manager `winget`:
117+
Download and install the installer from [the official website](https://git-scm.com/download/win), or install it using the Windows package manager `winget`:
118118

119119
```pwsh
120120
winget install --id git.git
@@ -167,7 +167,7 @@ winget install --id Docker.DockerDesktop
167167
168168
> [!NOTE]
169169
> The git hooks will check that your code is properly formatted before committing.
170-
> This is done both to avoid future merge conflicts and ensure uniformity inside the code base.
170+
> This is done both to avoid future merge conflicts and ensure uniformity across the code base.
171171
172172
* Configure git to automatically update submodules.
173173
```shell
@@ -188,11 +188,11 @@ winget install --id Docker.DockerDesktop
188188
### Configure Akka Token
189189
> [!NOTE]
190190
> You can skip this step if you don’t need instrumentation for the **akka-http-10.6** module.
191-
> For background on why Akka now requires authentication, see this [article](https://akka.io/blog/why-we-are-changing-the-license-for-akka).
191+
> For background on why Akka now requires authentication, see [this article](https://akka.io/blog/why-we-are-changing-the-license-for-akka).
192192

193193
To enable access to Akka artifacts hosted on Lightbend’s private repository, you’ll need to configure an authentication token.
194-
1. Obtain a repository token. Visit the Akka account [page](https://account.akka.io/token) to generate a secure repository token.
195-
2. Set up the environment variable. Create an environment variable named:
194+
1. Obtain a repository token by visiting the Akka account [page](https://account.akka.io/token) to generate a secure repository token.
195+
2. Create an environment variable named:
196196
```shell
197197
ORG_GRADLE_PROJECT_akkaRepositoryToken=<your_token>
198198
```

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ Take a look at the [APM Glossary][visualization docs].
3535

3636
Before contributing to the project, please take a moment to read our brief [Contribution Guidelines](CONTRIBUTING.md).
3737
Then check our guides:
38-
* [How to setup a development and build the project](BUILDING.md),
38+
* [How to set up a development environment and build the project](BUILDING.md),
3939
* [How to create a new instrumentation](docs/add_new_instrumentation.md),
4040
* [How to test](docs/how_to_test.md),
4141

4242
Or our reference documents:
4343
* [How instrumentations work](docs/how_instrumentations_work.md).
4444

4545
## Releases
46-
Datadog will generally create a new minor release the first full week of every month.
46+
Datadog will generally release a new minor version during the first full week of every month.
4747

4848
See [release.md](docs/releases.md) for more information.

0 commit comments

Comments
 (0)