Skip to content

Commit bc28add

Browse files
Add ReceiveSendGreetingServlet and publish workflow for matrix project (#272)
* Add ReceiveSendGreetingServlet and publish wf for matric project * Add donation doc to readme and missing license header * remove gson dependency and customer models * undo changes in test till new docker images are published * Make byte read wo need to buffer size
1 parent d8d9304 commit bc28add

32 files changed

+1013
-44
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Build test matrix images
2+
3+
on:
4+
push:
5+
paths:
6+
- 'smoke-tests/matrix/**'
7+
- '.github/workflows/build-test-matrix.yaml'
8+
branches: 'main'
9+
workflow_dispatch:
10+
11+
jobs:
12+
publish:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Set up JDK 11 for running Gradle
17+
uses: actions/setup-java@v1
18+
with:
19+
java-version: 11
20+
21+
- name: Cache gradle dependencies
22+
uses: burrunan/[email protected]
23+
with:
24+
job-id: matrix-smoke
25+
26+
- name: Login to Docker Hub
27+
uses: docker/login-action@v1
28+
with:
29+
username: ${{ secrets.DOCKERHUB_PUBLISH_USER }}
30+
password: ${{ secrets.DOCKERHUB_PUBLISH_TOKEN }}
31+
32+
- name: Build Docker Image
33+
run: |
34+
TAG="$(date '+%Y%m%d').$GITHUB_RUN_ID"
35+
echo "Using extra tag $TAG"
36+
./gradlew buildMatrix pushMatrix -PextraTag=$TAG
37+
working-directory: smoke-tests/matrix

smoke-tests/matrix/README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Matrix project code has been seeded from corresponding OTEL project here: `https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/main/smoke-tests/matrix`
2+
Code enhancement and modification has been done to test additional features supported by hypertrace java agent.
3+
4+
# Smoke Test Environment Matrix
5+
This project builds docker images containing a simple test web application deployed to various
6+
application servers or servlet containers. For each server several relevant versions are chosen.
7+
In addition we build separate images for several support major java versions.
8+
This way we can test our agent with many different combinations of runtime environment,
9+
its version and running on different JVM versions from different vendors.
10+
11+
Images from this project are only published when changes are made in `'smoke-tests/matrix/**'`
12+
See build workflow `.github/workflows/build-test-matrix.yaml` for details.

smoke-tests/matrix/build.gradle

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
2+
import com.bmuschko.gradle.docker.tasks.image.DockerPushImage
3+
4+
plugins {
5+
id "war"
6+
id "com.bmuschko.docker-remote-api" version "6.6.1"
7+
}
8+
9+
compileJava {
10+
options.release.set(8)
11+
}
12+
13+
repositories {
14+
jcenter()
15+
}
16+
dependencies {
17+
implementation("javax.servlet:javax.servlet-api:3.0.1")
18+
}
19+
20+
def buildMatrixTask = tasks.create("buildMatrix") {
21+
group = "build"
22+
description = "Builds all Docker images for the test matrix"
23+
}
24+
25+
Set<String> matrix = []
26+
tasks.create("pushMatrix", DockerPushImage) {
27+
group = "publishing"
28+
description = "Push all Docker images for the test matrix"
29+
dependsOn(buildMatrixTask)
30+
images.set(matrix)
31+
}
32+
33+
def targets = [
34+
"jetty" : [
35+
"9.4.35": ["8", "11", "15"],
36+
"10.0.0": ["11", "15"],
37+
],
38+
"tomcat" : [
39+
"7.0.107": ["8"],
40+
"8.5.60" : ["8", "11"],
41+
"9.0.40" : ["8", "11"],
42+
"10.0.0" : ["8", "11"]
43+
],
44+
"payara" : [
45+
"5.2020.6" : ["8"],
46+
"5.2020.6-jdk11": ["11"]
47+
],
48+
"wildfly": [
49+
"13.0.0.Final": ["8"],
50+
"17.0.1.Final": ["8", "11", "15"],
51+
"21.0.0.Final": ["8", "11", "15"]
52+
],
53+
"liberty": [
54+
"20.0.0.12": ["8", "11", "15", "8-jdk-openj9", "11-jdk-openj9", "15-jdk-openj9"]
55+
]
56+
]
57+
58+
def dockerWorkingDir = new File(project.buildDir, "docker")
59+
def extraTag = findProperty("extraTag") ?: new Date().format("yyyyMMdd.HHmmSS")
60+
targets.each { server, data ->
61+
data.forEach { version, jdks ->
62+
jdks.forEach { jdk ->
63+
def dockerfile = "${server}.dockerfile"
64+
65+
def prepareTask = tasks.register("${server}ImagePrepare-$version-jdk$jdk", Copy) {
66+
def warTask = project.tasks.war
67+
it.dependsOn(warTask)
68+
it.into(dockerWorkingDir)
69+
it.from("src")
70+
it.from(warTask.archiveFile) {
71+
rename { _ -> "app.war" }
72+
}
73+
}
74+
def image = "hypertrace/agent/java-test-containers:$server-$version-jdk$jdk-$extraTag"
75+
matrix.add(image)
76+
def buildTask = tasks.register("${server}Image-$version-jdk$jdk", DockerBuildImage) {
77+
it.dependsOn(prepareTask)
78+
group = "build"
79+
description = "Builds Docker image with $server $version on JDK $jdk"
80+
81+
it.inputDir.set(dockerWorkingDir)
82+
it.images.add(image)
83+
it.dockerFile.set(new File(dockerWorkingDir, dockerfile))
84+
it.buildArgs.set(["version": version, "jdk": jdk])
85+
}
86+
87+
buildMatrixTask.dependsOn(buildTask)
88+
}
89+
}
90+
}
91+
92+
assemble.dependsOn(buildMatrixTask)
Binary file not shown.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionSha256Sum=3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d

smoke-tests/matrix/gradlew

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
##
21+
## Gradle start up script for UN*X
22+
##
23+
##############################################################################
24+
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
42+
43+
APP_NAME="Gradle"
44+
APP_BASE_NAME=`basename "$0"`
45+
46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
49+
# Use the maximum available, or set MAX_FD != -1 to use that value.
50+
MAX_FD="maximum"
51+
52+
warn () {
53+
echo "$*"
54+
}
55+
56+
die () {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
61+
}
62+
63+
# OS specific support (must be 'true' or 'false').
64+
cygwin=false
65+
msys=false
66+
darwin=false
67+
nonstop=false
68+
case "`uname`" in
69+
CYGWIN* )
70+
cygwin=true
71+
;;
72+
Darwin* )
73+
darwin=true
74+
;;
75+
MINGW* )
76+
msys=true
77+
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
81+
esac
82+
83+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84+
85+
86+
# Determine the Java command to use to start the JVM.
87+
if [ -n "$JAVA_HOME" ] ; then
88+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
89+
# IBM's JDK on AIX uses strange locations for the executables
90+
JAVACMD="$JAVA_HOME/jre/sh/java"
91+
else
92+
JAVACMD="$JAVA_HOME/bin/java"
93+
fi
94+
if [ ! -x "$JAVACMD" ] ; then
95+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
96+
97+
Please set the JAVA_HOME variable in your environment to match the
98+
location of your Java installation."
99+
fi
100+
else
101+
JAVACMD="java"
102+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
103+
104+
Please set the JAVA_HOME variable in your environment to match the
105+
location of your Java installation."
106+
fi
107+
108+
# Increase the maximum file descriptors if we can.
109+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
110+
MAX_FD_LIMIT=`ulimit -H -n`
111+
if [ $? -eq 0 ] ; then
112+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
113+
MAX_FD="$MAX_FD_LIMIT"
114+
fi
115+
ulimit -n $MAX_FD
116+
if [ $? -ne 0 ] ; then
117+
warn "Could not set maximum file descriptor limit: $MAX_FD"
118+
fi
119+
else
120+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
121+
fi
122+
fi
123+
124+
# For Darwin, add options to specify how the application appears in the dock
125+
if $darwin; then
126+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
127+
fi
128+
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
134+
JAVACMD=`cygpath --unix "$JAVACMD"`
135+
136+
# We build the pattern for arguments to be converted via cygpath
137+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
138+
SEP=""
139+
for dir in $ROOTDIRSRAW ; do
140+
ROOTDIRS="$ROOTDIRS$SEP$dir"
141+
SEP="|"
142+
done
143+
OURCYGPATTERN="(^($ROOTDIRS))"
144+
# Add a user-defined pattern to the cygpath arguments
145+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
146+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
147+
fi
148+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
149+
i=0
150+
for arg in "$@" ; do
151+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
152+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
153+
154+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
155+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
156+
else
157+
eval `echo args$i`="\"$arg\""
158+
fi
159+
i=`expr $i + 1`
160+
done
161+
case $i in
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
172+
esac
173+
fi
174+
175+
# Escape application args
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
179+
}
180+
APP_ARGS=`save "$@"`
181+
182+
# Collect all arguments for the java command, following the shell quoting and substitution rules
183+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
184+
185+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)