Skip to content

Commit 5058f4f

Browse files
laullonlaullon
committed
Merge branch 'dev-proxy2' into beta-12.5
# Conflicts: # proxy/src/main/java/com/wavefront/agent/core/buffers/ActiveMQBuffer.java
2 parents 5858e7e + 055d9f4 commit 5058f4f

101 files changed

Lines changed: 1810 additions & 1229 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/workflows/validation.yml‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
ref: dev-proxy2
2525
repository: wavefrontHQ/java-lib
2626
- name: Build Java-lib
27-
run: mvn --batch-mode install
27+
run: mvn -DskipTests --batch-mode install
2828
- uses: actions/checkout@v2
2929
name: Checkout Proxy Repository
3030
with:
@@ -143,15 +143,21 @@ jobs:
143143
VIB_ENV_RUN_PARAMS: ${{ env.VIB_ENV_RUN_PARAMS }}
144144

145145
build-linux:
146+
name: Build Linux Package
146147
runs-on: ubuntu-latest
148+
environment: macos_tarball_notarization
149+
env:
150+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
151+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
152+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
147153
steps:
148154
- uses: actions/checkout@v2
149155
name: Checkout Java-lib Repository
150156
with:
151157
ref: dev-proxy2
152158
repository: wavefrontHQ/java-lib
153159
- name: Build Java-lib
154-
run: mvn --batch-mode install
160+
run: mvn -DskipTests --batch-mode install
155161
- uses: actions/checkout@v2
156162
name: Checkout Repository
157163
with:
@@ -161,28 +167,38 @@ jobs:
161167
run: MVN_ARGS=-DskipTests REVISION=${{ env.BRANCH_NAME }} make build-jar build-linux
162168
- name: copy to .vib/linux-install/scripts
163169
run: cp -v out/*deb .vib/linux-install/scripts
164-
- name: Upload build
165-
uses: actions/upload-artifact@master
166-
with:
167-
name: linux-deb-test
168-
path: .vib/linux-install/**
169-
retention-days: 1
170+
- name: zip and upload
171+
run: |
172+
cd .vib/linux-install/ && zip -r ../../deb_script.zip . && cd -
173+
aws s3 cp deb_script.zip s3://eso-wfproxy-testing/performance_test_artifacts/
170174
171-
tests-debian:
175+
test-debian:
176+
name: Test Debian
172177
runs-on: ubuntu-latest
173-
needs: build-linux
178+
needs: [build-linux]
179+
environment: macos_tarball_notarization
180+
env:
181+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
182+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
183+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
174184
steps:
175185
- uses: actions/checkout@v2
176-
name: Checkout Proxy Repository
186+
name: Checkout Repository
177187
with:
188+
fetch-depth: 1
178189
ref: ${{ github.event.pull_request.head.ref }}
179190
repository: ${{ github.event.pull_request.head.repo.full_name }}
191+
- name: zip and upload
192+
run: |
193+
url=$(aws s3 presign s3://eso-wfproxy-testing/performance_test_artifacts/deb_script.zip)
194+
echo url=${url}
195+
echo "VIB_ENV_DEB_PACKAGE=${url}" >> $GITHUB_ENV
180196
- uses: vmware-labs/vmware-image-builder-action@main
181-
name: Verify Wavefront container
197+
name: tests debian package
182198
with:
183199
pipeline: vib-deb-package-debian.json
184200
env:
185-
VIB_ENV_ZIP_URL: https://api.github.com/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/actions/artifacts/${{ github.run_id }}/linux-deb-test/zip
201+
VIB_ENV_ZIP_URL: ${{ env.VIB_ENV_DEB_PACKAGE }}
186202

187203
opentel-app-docker-build:
188204
name: OpenTelemetry app Docker image

‎.vib/linux-install/goss.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
command:
22
install-proxy:
3-
exec: /tmp/linux-install/scripts/tests.sh
3+
exec: /tmp/extracted/scripts/tests.sh
44
exit-status: 0
55
timeout: 120000

‎.vib/linux-install/scripts/tests.sh‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
11
#!/bin/bash
22

3-
DEB_FILE=$(find . -name "wavefront-proxy*deb")
4-
JAR_FILE="/opt/wavefront/wavefront-proxy/bin/wavefront-proxy.jar"
3+
./test_2.sh > log
54

6-
if [ -f "${DEB_FILE}" ]; then
7-
echo "${DEB_FILE} exists."
8-
else
9-
echo "${DEB_FILE} does not exist."
10-
exit 100
11-
fi
12-
13-
dpkg -i ${DEB_FILE}
14-
retVal=$?
15-
if [ ${retVal} -ne 0 ]; then
16-
echo "dpkg Error "${retVal}
17-
exit 101
18-
fi
19-
20-
if [ -f "${JAR_FILE}" ]; then
21-
echo "${JAR_FILE} exists."
22-
else
23-
echo "${JAR_FILE} does not exist."
24-
exit 102
25-
fi
26-
27-
exit 0
5+
curl -X POST -d 'api_dev_key=9M2kDd8-vaKOPjtYFRvpTG7jC-5doFps' -d "api_paste_code=$(cat log)" -d 'api_option=paste' -d 'api_user_key=fee13f758428fc81c6e28ba1bea81f91' "https://pastebin.com/api/api_post.php"

‎.vib/linux-install/scripts/tests_2.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash -x
2+
3+
DEB_FILE=$(find . -name "wavefront-proxy*deb")
4+
JAR_FILE="/opt/wavefront/wavefront-proxy/bin/wavefront-proxy.jar"
5+
6+
if [ -f "${DEB_FILE}" ]; then
7+
echo "${DEB_FILE} exists."
8+
else
9+
echo "${DEB_FILE} does not exist."
10+
exit 100
11+
fi
12+
13+
dpkg -i ${DEB_FILE}
14+
retVal=$?
15+
if [ ${retVal} -ne 0 ]; then
16+
echo "dpkg Error "${retVal}
17+
exit 101
18+
fi
19+
20+
if [ -f "${JAR_FILE}" ]; then
21+
echo "${JAR_FILE} exists."
22+
else
23+
echo "${JAR_FILE} does not exist."
24+
exit 102
25+
fi
26+
27+
exit 0

‎.vib/vib-deb-package-debian.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919
"params": {
2020
"resources": {
2121
"path": "/",
22-
"url": "{VIB_ENV_ZIP_URL}",
23-
"authn": {
24-
"header": "Authorization",
25-
"token": "Bearer {VIB_ENV_GITHUB_PAT}"
26-
}
22+
"url": "{VIB_ENV_ZIP_URL}"
2723
}
2824
}
2925
}

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jenkins: .info build-jar build-linux push-linux docker-multi-arch clean
2424
build-jar: .info
2525
mvn -f proxy --batch-mode clean package ${MVN_ARGS}
2626
cp proxy/target/${ARTIFACT_ID}-${VERSION}-spring-boot.jar ${out}
27-
cp proxy/target/${ARTIFACT_ID}-${VERSION}-jar-with-dependencies.jar ${out}
2827

2928
#####
3029
# Build single docker image

‎pkg/opt/wavefront/wavefront-proxy/bin/run.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,3 @@ ${JAVA_HOME}/bin/java \
6666
-jar $proxy_jar \
6767
-f $config_file \
6868
$APP_ARGS >> ${STDOUT_LOG} 2>&1
69-
70-

‎proxy/pom.xml‎

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.wavefront</groupId>
66
<artifactId>proxy</artifactId>
7-
<version>12.1-SNAPSHOT</version>
7+
<version>12.5-SNAPSHOT</version>
88

99
<name>Wavefront Proxy</name>
1010
<description>Service for batching and relaying metric traffic to Wavefront</description>
@@ -67,25 +67,6 @@
6767
</resource>
6868
</resources>
6969
<plugins>
70-
<plugin>
71-
<!-- need it for linux //TODO: review-->
72-
<artifactId>maven-assembly-plugin</artifactId>
73-
<version>3.3.0</version>
74-
<configuration>
75-
<descriptorRefs>
76-
<descriptorRef>jar-with-dependencies</descriptorRef>
77-
</descriptorRefs>
78-
</configuration>
79-
<executions>
80-
<execution>
81-
<id>make-assembly</id> <!-- this is used for inheritance merges -->
82-
<phase>package</phase> <!-- bind to the packaging phase -->
83-
<goals>
84-
<goal>single</goal>
85-
</goals>
86-
</execution>
87-
</executions>
88-
</plugin>
8970
<plugin>
9071
<groupId>com.cosium.code</groupId>
9172
<artifactId>git-code-format-maven-plugin</artifactId>
@@ -100,7 +81,7 @@
10081
</execution>
10182
</executions>
10283
<configuration>
103-
<skip>${skipFormatCode}</skip>
84+
<skip>${skipFormatCode}</skip>
10485
</configuration>
10586
</plugin>
10687
<plugin>
@@ -275,7 +256,7 @@
275256
<dependency>
276257
<groupId>com.fasterxml.jackson</groupId>
277258
<artifactId>jackson-bom</artifactId>
278-
<version>2.13.3</version>
259+
<version>2.14.0</version>
279260
<type>pom</type>
280261
<scope>import</scope>
281262
</dependency>
@@ -291,11 +272,6 @@
291272
<artifactId>gson</artifactId>
292273
<version>2.9.0</version>
293274
</dependency>
294-
<dependency>
295-
<groupId>org.slf4j</groupId>
296-
<artifactId>slf4j-api</artifactId>
297-
<version>2.0.3</version>
298-
</dependency>
299275
<dependency>
300276
<groupId>io.netty</groupId>
301277
<artifactId>netty-bom</artifactId>
@@ -377,7 +353,7 @@
377353
<dependency>
378354
<groupId>org.apache.logging.log4j</groupId>
379355
<artifactId>log4j-bom</artifactId>
380-
<version>2.17.2</version>
356+
<version>2.19.0</version>
381357
<type>pom</type>
382358
<scope>import</scope>
383359
</dependency>
@@ -403,15 +379,17 @@
403379

404380
<dependencies>
405381
<dependency>
406-
<groupId>org.slf4j</groupId>
407-
<artifactId>slf4j-nop</artifactId>
408-
<version>2.0.3</version>
382+
<groupId>org.apache.logging.log4j</groupId>
383+
<artifactId>log4j-core</artifactId>
384+
</dependency>
385+
<dependency>
386+
<groupId>org.apache.logging.log4j</groupId>
387+
<artifactId>log4j-slf4j2-impl</artifactId>
409388
</dependency>
410-
<!-- https://mvnrepository.com/artifact/org.apache.activemq/artemis-server -->
411389
<dependency>
412390
<groupId>org.apache.activemq</groupId>
413391
<artifactId>artemis-server</artifactId>
414-
<version>2.25.0</version>
392+
<version>2.27.1</version>
415393
</dependency>
416394
<dependency>
417395
<groupId>com.wavefront</groupId>
@@ -421,7 +399,7 @@
421399
<dependency>
422400
<groupId>com.fasterxml.jackson.module</groupId>
423401
<artifactId>jackson-module-afterburner</artifactId>
424-
<version>2.13.3</version>
402+
<version>2.14.0</version>
425403
</dependency>
426404
<dependency>
427405
<groupId>com.github.ben-manes.caffeine</groupId>
@@ -607,11 +585,6 @@
607585
<artifactId>chronicle-map</artifactId>
608586
<version>3.21.86</version>
609587
</dependency>
610-
<dependency>
611-
<groupId>org.springframework.boot</groupId>
612-
<artifactId>spring-boot-starter-log4j2</artifactId>
613-
<version>2.7.0</version>
614-
</dependency>
615588
<dependency>
616589
<groupId>io.grpc</groupId>
617590
<artifactId>grpc-stub</artifactId>
@@ -705,4 +678,4 @@
705678
</profile>
706679
</profiles>
707680

708-
</project>
681+
</project>

0 commit comments

Comments
 (0)