Skip to content
Merged
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
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
15 changes: 15 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!-- Thanks for sending a pull request! Before submitting:

1. Read our CONTRIBUTING.md guide
2. Rebase your PR if it gets out of sync with main
-->

**What this PR does**:

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Checklist**
- [ ] Tests updated
- [ ] Documentation added
- [ ] `CHANGELOG.md` updated - the order of entries should be `[CHANGE]`, `[FEATURE]`, `[ENHANCEMENT]`, `[BUGFIX]`
39 changes: 38 additions & 1 deletion .github/workflows/on_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,41 @@ jobs:
- name: Update java version
run: mvn versions:set -DnewVersion=${VERSION} -B -U
- name: Build and Release
run: mvn -s .ci-settings.xml clean deploy -DskipTests -P release-ossrh -B -U -pl agent,deep --also-make
run: mvn -s .ci-settings.xml clean deploy -DskipTests -P release-ossrh -B -U -pl agent,deep --also-make

- name: Upload release binary
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ github.token }}
with:
upload_url: ${{ steps.get_release.outputs.upload_url }}
asset_path: ./agent/target/deep-${VERSION}.jar
asset_name: Deep Agent
asset_content_type: application/octet-stream

JavaSite:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: 'maven'

- name: Package project
run: mvn clean package -DskipTests -U -B -P cf-it-tests,examples

- name: Build site
run: mvn -U -B site:site site:stage -P docs,cf-it-tests,examples

- name: Zip Site
run: tar -czf site.tar.gz target/staging

- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: Maven Site
path: site.tar.gz
35 changes: 5 additions & 30 deletions .github/workflows/update_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,6 @@ permissions:


jobs:
JavaSite:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: 'maven'

- name: Package project
run: mvn clean package -DskipTests -U -B -P cf-it-tests,examples

- name: Build site
run: mvn -U -B site:site site:stage -P docs,cf-it-tests,examples

- name: Zip Site
run: tar -czf site.tar.gz target/staging

- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: Mvn docs
path: site.tar.gz

mkdocs:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -73,10 +46,12 @@ jobs:
with:
name: Mk docs
path: _site
- name: Download mvn artifact
uses: actions/download-artifact@v3

- name: Download mvn site from latest
uses: robinraju/[email protected]
with:
name: Mvn docs
latest: true
fileName: site.tar.gz

- name: Unpack
run: |
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# 1.1.0 (xx/xx/2023)

- **[CHANGE]**: include bytebuddy in deep build [#12](https://github.com/intergral/deep/pull/12) [@Umaaz](https://github.com/Umaaz)
- **[CHANGE]**: add issue and PR templates [#14](https://github.com/intergral/deep/pull/14) [@Umaaz](https://github.com/Umaaz)
- **[CHANGE]**: change docs to use latest release maven site [#14](https://github.com/intergral/deep/pull/14) [@Umaaz](https://github.com/Umaaz)
- **[ENHANCEMENT]**: add unit tests for agent [#10](https://github.com/intergral/deep/pull/10) [@Umaaz](https://github.com/Umaaz)
- **[BUGFIX]**: fix doc generation [#13](https://github.com/intergral/deep/pull/13) [@Umaaz](https://github.com/Umaaz)

# 1.0.5 (03/08/2023)

- **[ENHANCEMENT]**: allow plugins to act as auth providers [#9](https://github.com/intergral/deep/pull/9) [@Umaaz](https://github.com/Umaaz)
- **[BUGFIX]**: fix case where jar path is not set [#8](https://github.com/intergral/deep/pull/8) [@Umaaz](https://github.com/Umaaz)

<!-- Template START
# 0.1.1 (16/06/2023)

- **[CHANGE]**: description [#PRid](https://github.com/intergral/deep/pull/8) [@user](https://github.com/)
- **[FEATURE]**: description [#PRid](https://github.com/intergral/deep/pull/) [@user](https://github.com/)
- **[ENHANCEMENT]**: description [#PRid](https://github.com/intergral/deep/pull/) [@user](https://github.com/)
- **[BUGFIX]**: description [#PRid](https://github.com/intergral/deep/pull/) [@user](https://github.com/)
Template END -->
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import io.grpc.Server;
import io.grpc.ServerBuilder;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
Expand All @@ -64,6 +65,7 @@ class LongPollServiceTest {
private PollRequest request;
private PollResponse response;
private Throwable responseError;
private int port;

@BeforeEach
void setUp() throws IOException {
Expand All @@ -77,12 +79,17 @@ void setUp() throws IOException {
responseObserver.onCompleted();
});

server = ServerBuilder.forPort(9999).addService(testPollService.bindService()).build();
// find a free port
try (ServerSocket socket = new ServerSocket(0)) {
port = socket.getLocalPort();
}

server = ServerBuilder.forPort(port).addService(testPollService.bindService()).build();

server.start();

final HashMap<String, String> agentArgs = new HashMap<>();
agentArgs.put(ISettings.KEY_SERVICE_URL, "localhost:9999");
agentArgs.put(ISettings.KEY_SERVICE_URL, "localhost:" + port);
agentArgs.put(ISettings.KEY_SERVICE_SECURE, "false");
final Settings settings = Settings.build(agentArgs);
settings.setResource(Resource.create(Collections.singletonMap("test", "resource")));
Expand Down