Skip to content
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

Minor update to the contributing doc #707

Merged
merged 4 commits into from
Jul 16, 2020
Merged

Minor update to the contributing doc #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a151d4
Minor update to the contributing doc
heyams Jul 15, 2020
e35a654
Update CONTRIBUTING.md
heyams Jul 15, 2020
bd63533
Update CONTRIBUTING.md
heyams Jul 15, 2020
caa335d
Use .gitattributes to make spotless respect line endings
heyams Jul 16, 2020
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
5 changes: 5 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
* text=auto eol=lf

*.bat text eol=crlf
*.cmd text eol=crlf

19 changes: 16 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ still access helper classes from bootstrap classloader.
#### Agent jar structure

If you now look inside
`java-agent/build/libs/opentelemetry-javaagent-<version>-all.jar`, you will see the
`opentelemetry-javaagent/build/libs/opentelemetry-javaagent-<version>-all.jar`, you will see the
following "clusters" of classes:

- `inst/` - contains `agent-tooling` module and `instrumentation` submodules, loaded and isolated inside
Expand All @@ -86,10 +86,23 @@ snapshot builds of the `master` branch. They are available from

Build using Java 11:

```gradle assemble```
```bash
java -version
```

```bash
./gradlew assemble
```

and then generate the -all artifact

```bash
./gradlew :opentelemetry-javaagent:shadowJar
```
heyams marked this conversation as resolved.
Show resolved Hide resolved

and then you can find the java agent artifact at
`java-agent/build/lib/opentelemetry-javaagent-<version>-all.jar`.

`opentelemetry-javaagent/build/lib/opentelemetry-javaagent-<version>-all.jar`.

### Testing

Expand Down