Skip to content

Commit 7c49af9

Browse files
author
Katie West
authored
Merge pull request #33 from newrelic/kwest/java-layer-poc
Kwest/java layer poc
2 parents 8446b6b + 5b540e6 commit 7c49af9

File tree

12 files changed

+619
-1
lines changed

12 files changed

+619
-1
lines changed

.circleci/config.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,34 @@ jobs:
108108
command: |
109109
cd python
110110
./publish-layers.sh python3.8
111+
publish-java8.al2:
112+
docker:
113+
- image: circleci/openjdk-8-stretch
114+
steps:
115+
- checkout
116+
- run: sudo apt-get update && sudo apt-get install -y python3-pip
117+
- run:
118+
name: Install publish dependencies
119+
command: sudo pip3 install -U awscli
120+
- run:
121+
name: Publish layer
122+
command: |
123+
cd java
124+
./publish-layers.sh java8.al2
125+
publish-java11:
126+
docker:
127+
- image: circleci/openjdk-11-stretch
128+
steps:
129+
- checkout
130+
- run: sudo apt-get update && sudo apt-get install -y python3-pip
131+
- run:
132+
name: Install publish dependencies
133+
command: sudo pip3 install -U awscli
134+
- run:
135+
name: Publish layer
136+
command: |
137+
cd java
138+
./publish-layers.sh java11
111139
112140
publish-extension:
113141
docker:
@@ -175,6 +203,18 @@ workflows:
175203
ignore: /.*/
176204
tags:
177205
only: /v[0-9]+(\.[0-9]+)*_python/
206+
- publish-java11:
207+
filters:
208+
branches:
209+
ignore: /.*/
210+
tags:
211+
only: /v[0-9]+(\.[0-9]+)*_java/
212+
- publish-java8.al2:
213+
filters:
214+
branches:
215+
ignore: /.*/
216+
tags:
217+
only: /v[0-9]+(\.[0-9]+)*_java/
178218
- publish-extension:
179219
filters:
180220
branches:

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ cd nodejs;
3131
cd ..
3232
```
3333

34+
```
35+
cd java;
36+
./publish-layers.sh
37+
cd ..
38+
```
39+
3440
## Attaching Custom Lambda Layer ARNs
3541

3642
The layers published to your account may be used directly within SAM, Cloudformation Templates, Serverless.yml, or other configuration methods that allow specifying the use of layers by ARN.
@@ -56,6 +62,9 @@ These steps will help you configure the layers correctly:
5662
3. Update your functions handler to point to the newly attached layer in the console for your function:
5763
* Python: newrelic_lambda_wrapper.handler
5864
* Node: newrelic-lambda-wrapper.handler
65+
* Java:
66+
* RequestHandler implementation: com.newrelic.java.HandlerWrapper::handleRequest
67+
* RequestStreamHandlerWrapper implementation: RequestHandler implementation: com.newrelic.java.HandlerWrapper::handleStreamsRequest
5968
4. Add these environment variables to your Lambda console:
6069
* NEW_RELIC_ACCOUNT_ID: Your New Relic account ID
6170
* NEW_RELIC_LAMBDA_HANDLER: Path to your initial handler.

extension/publish-layer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function publish-layer {
5454
--content "S3Bucket=${bucket_name},S3Key=${layer_s3key}" \
5555
--description "New Relic Lambda Extension Layer" \
5656
--license-info "Apache-2.0" \
57-
--compatible-runtimes "dotnetcore3.1" "java8.al2" "java11" "provided" "provided.al2" \
57+
--compatible-runtimes "dotnetcore3.1" "provided" "provided.al2" \
5858
--region $region \
5959
--output text \
6060
--query Version)

java/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.gradle
2+
.idea
3+
build

java/build.gradle

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
plugins {
2+
id 'application'
3+
}
4+
5+
repositories {
6+
jcenter()
7+
}
8+
9+
dependencies {
10+
implementation("io.opentracing:opentracing-util:0.33.0")
11+
implementation("com.newrelic.opentracing:newrelic-java-lambda:2.2.1")
12+
implementation("com.newrelic.opentracing:java-aws-lambda:2.1.0")
13+
implementation("com.amazonaws:aws-lambda-java-events:3.8.0")
14+
implementation("com.amazonaws:aws-lambda-java-core:1.2.0")
15+
implementation("com.amazonaws:aws-lambda-java-serialization:1.0.0")
16+
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.2")
17+
implementation("com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.2")
18+
testImplementation("junit:junit:4.13")
19+
}
20+
21+
task packageFat(type: Zip) {
22+
from compileJava
23+
from processResources
24+
into('java/lib') {
25+
from configurations.runtimeClasspath
26+
}
27+
from(sourceSets.main.output.getClassesDirs().collect {it.isDirectory() ? it:zipTree(it)}) {
28+
into ('lib')
29+
}
30+
dirMode = 0755
31+
fileMode = 0755
32+
}
33+
34+
task copyLibs(type: Copy) {
35+
from('build/libs')
36+
into('build/java/lib')
37+
include('NewRelicJavaLayer.jar')
38+
}
39+
40+
ext.javaVersion = hasProperty('javaVersion') && project.getProperty('javaVersion') == 11 ?
41+
JavaVersion.VERSION_11 : JavaVersion.VERSION_1_8
42+
43+
java {
44+
sourceCompatibility = javaVersion
45+
targetCompatibility = javaVersion
46+
}
47+
48+
copyLibs.dependsOn packageFat
57.8 KB
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
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

java/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)