Skip to content

Commit 7cd1d09

Browse files
authored
[stream] add stream module; update github actions (#8)
[stream] add stream module; update github actions
1 parent 861f39e commit 7cd1d09

179 files changed

Lines changed: 8291 additions & 43 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.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Create Github Release
4+
5+
on:
6+
push:
7+
# Sequence of patterns matched against refs/tags
8+
tags:
9+
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
10+
jobs:
11+
build:
12+
name: Create Release
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v2
17+
- name: Create Release
18+
id: create_release
19+
uses: actions/create-release@v1
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
22+
with:
23+
tag_name: ${{ github.ref }}
24+
release_name: Release ${{ github.ref }}
25+
body: |
26+
Changes in this Release
27+
- First Change
28+
- Second Change
29+
draft: true
30+
prerelease: false

.github/workflows/maven-deploy.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Deploy To Central Maven
2+
3+
on:
4+
release:
5+
types: [created]
6+
7+
jobs:
8+
publish:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Set up Maven Central Repository
13+
uses: actions/setup-java@v1
14+
with:
15+
java-version: 1.8
16+
server-id: ossrh
17+
server-username: MAVEN_USERNAME
18+
server-password: MAVEN_PASSWORD
19+
- name: Publish package
20+
run: mvn -B deploy -Possrh
21+
env:
22+
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
23+
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}

.github/workflows/maven-test.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This workflow will build a Java project with Maven
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
4+
name: Mvn Test
5+
6+
on:
7+
push:
8+
branches:
9+
- master
10+
- ci
11+
pull_request:
12+
branches:
13+
- master
14+
- ci
15+
16+
jobs:
17+
build:
18+
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- uses: actions/checkout@v2
23+
- name: Set up JDK 1.8
24+
uses: actions/setup-java@v1
25+
with:
26+
java-version: 1.8
27+
- name: Build with Maven
28+
run: mvn -B package --file pom.xml
29+
- name: Unit Test
30+
run: mvn -B test -Punit-test

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,5 @@ fabric.properties
9393
hs_err_pid*
9494

9595
temp/
96-
*.iml
96+
*.iml
97+
**/*.iml
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22

33
## Set up your local development environment
44

5+
1. set your git config. (suggest you set your email to [github private email address](https://github.com/settings/emails)):
6+
7+
```
8+
git config user.name $YOUR_GITHUB_NAME
9+
git config user.email $YOUR_GITHUB_EMAIL
10+
# to double check config
11+
git config --local -l
12+
13+
# sign your code with GPG
14+
git config commit.gpgsign true
15+
```
16+
517
1. install [Docker](https://www.docker.com/products/docker-desktop)
618
2. run docker compose file: `docker-compose up`. This will start up following images:
719

@@ -32,6 +44,9 @@ gpg --keyserver hkp://keys.gnupg.net --send-keys YOUR_KEY_ID
3244
gpg --keyserver hkp://pool.sks-keyservers.net --send-keys YOUR_KEY_ID
3345
```
3446

47+
[GPG Suite](https://gpgtools.org/) is a useful to maintain GPG key on MacOS.
48+
[Signing commits]() doc on github explained how to sign the commits.
49+
3550
#### Step two: register an OSSRH account and configure to maven setting
3651

3752
The first, register a [JIRA account](https://issues.sonatype.org/secure/Signup!default.jspa).

README.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
# Introduce
1+
# [ETrace](https://etrace.io)\: a robust Application Performance Monitor system.
2+
3+
[![Hex.pm](https://img.shields.io/hexpm/l/plug)](https://github.com/jacobke/etrace/blob/master/LICENSE)
4+
[![Maven Central](https://img.shields.io/maven-central/v/io.etrace/etrace-agent?label=etrace)](https://search.maven.org/search?q=a:etrace-agent)
5+
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/etrace-io/etrace/Mvn%20Test)](https://github.com/etrace-io/etrace/actions?query=workflow%3A%22Mvn+Test%22)
6+
[![CodeFactor](https://img.shields.io/codefactor/grade/github/etrace-io/etrace)](https://www.codefactor.io/repository/github/etrace-io/etrace)
7+
8+
[![GitHub issues](https://img.shields.io/github/issues/etrace-io/etrace)](https://github.com/etrace-io/etrace/issues)
9+
[![GitHub commit activity](https://img.shields.io/github/commit-activity/m/etrace-io/etrace)](https://github.com/etrace-io/etrace/pulse)
10+
[![GitHub last commit](https://img.shields.io/github/last-commit/etrace-io/etrace)](https://github.com/etrace-io/etrace/graphs/commit-activity)
11+
![GitHub Org's stars](https://img.shields.io/github/stars/etrace-io?style=social)
212

3-
This is a robust Application Performance Monitor system.
13+
14+
# Introduce
415

docker-compose-etrace.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@ services:
2424
networks:
2525
- backend
2626

27+
stream:
28+
build:
29+
context: ./etrace-stream/stream-container
30+
dockerfile: Dockerfile
31+
image: etrace-api:local
32+
container_name: etrace_stream
33+
# ports:
34+
# - 9000:9001
35+
networks:
36+
- backend
37+
2738
networks:
2839
backend:
2940
driver: bridge

etrace-collector/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM nimmis/java-centos:oracle-8-jdk as jdk8
22
EXPOSE 2890
3-
COPY target/etrace-collector.tar.gz /etrace-collector/
3+
ADD target/etrace-collector.tar.gz /etrace-collector/
44
WORKDIR /etrace-collector
55
RUN tar -xf etrace-collector.tar.gz
66
RUN ls

etrace-common/src/main/java/io/etrace/common/constant/InternalMetricName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ public interface InternalMetricName {
3232
String KAFKA_PRODUCER_LOSE_DATA = "kafka.producer.lose.data";
3333
String KAFKA_BLOCK_STORE_SEND = "kafka.block.store.send";
3434

35-
String LINDB_PRODUCER_SEND = "lindb.producer.send";
35+
String STREAM_PRODUCER_SEND = "stream.producer.send";
3636

3737
}

etrace-common/src/main/java/io/etrace/common/pipeline/PipelineConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ public enum Type {
4242
TCP,
4343
GRPC,
4444
KAFKA,
45-
LINDB,
4645
HDFS,
4746
HBASE,
4847
ES,
49-
PROMETHEUS
48+
PROMETHEUS,
49+
LINDB,
5050
}
5151
}
5252

0 commit comments

Comments
 (0)