-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
adding custom logging test + local runtimes-common integration test (#…
…134) * adding custom logging test + local runtimes-common integration test * organize imports + namings * changed test-app to lazy init + local-cloud-builder * DEVELOPING instructions updated + enforcer plugin fixed for property resolution * cleanup * cleanup * Add shutdown tests back to maven execution (#149) * cleanup + adding automated application-default credentials logic instead of GOOGLE_APPLICATION_CREDENTIALS * cleaning up unnecessary dependencies
- Loading branch information
Showing
17 changed files
with
316 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Copyright 2017 Google Inc. All rights reserved. | ||
|
|
||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
|
|
||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
|
|
||
| # exit on command failure | ||
| set -e | ||
|
|
||
| readonly dir=$(dirname $0) | ||
| readonly projectRoot="$dir/.." | ||
| readonly testAppDir="$projectRoot/test-application" | ||
| readonly deployDir="$testAppDir/target/deploy" | ||
|
|
||
| APP_IMAGE='openjdk-local-integration' | ||
| CONTAINER=${APP_IMAGE}-container | ||
| OUTPUT_FILE=${CONTAINER}-output.txt | ||
| DEPLOYMENT_TOKEN=$(uuidgen) | ||
|
|
||
| readonly imageUnderTest=$1 | ||
| if [[ -z "$imageUnderTest" ]]; then | ||
| echo "Usage: ${0} <image_under_test>" | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [[ ! -f $HOME/.config/gcloud/application_default_credentials.json ]]; then | ||
| # get default application credentials | ||
| gcloud auth application-default login | ||
| fi | ||
|
|
||
| # build the test app | ||
| pushd ${testAppDir} | ||
| mvn clean package -Ddeployment.token="${DEPLOYMENT_TOKEN}" -DskipTests --batch-mode | ||
| popd | ||
|
|
||
| # build app container locally | ||
| pushd $deployDir | ||
| export STAGING_IMAGE=$imageUnderTest | ||
| envsubst < Dockerfile.in > Dockerfile | ||
| echo "Building app container..." | ||
| docker build -t $APP_IMAGE . || docker build -t $APP_IMAGE . | ||
|
|
||
| docker rm -f $CONTAINER || echo "Integration-test-app container is not running, ready to start a new instance." | ||
|
|
||
| # run app container locally to test shutdown logging | ||
| echo "Starting app container..." | ||
| docker run --rm --name $CONTAINER -p 8080 \ | ||
| -e "SHUTDOWN_LOGGING_THREAD_DUMP=true" \ | ||
| -e "SHUTDOWN_LOGGING_HEAP_INFO=true" \ | ||
| -v "$HOME/.config/gcloud/:/root/.config/gcloud" $APP_IMAGE &> $OUTPUT_FILE & | ||
|
|
||
| function waitForOutput() { | ||
| found_output='false' | ||
| for run in {1..10} | ||
| do | ||
| grep "$1" $OUTPUT_FILE && found_output='true' && break | ||
| sleep 1 | ||
| done | ||
|
|
||
| if [ "$found_output" == "false" ]; then | ||
| cat $OUTPUT_FILE | ||
| echo "did not match '$1' in '$OUTPUT_FILE'" | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| waitForOutput 'Started Application' | ||
|
|
||
| getPort() { | ||
| docker inspect --format='{{range $p, $conf := .NetworkSettings.Ports}}{{(index $conf 0).HostPort}}{{end}}' ${CONTAINER} | ||
| } | ||
|
|
||
|
|
||
| PORT=`getPort` | ||
|
|
||
| nslookup `hostname` | grep Address | grep -v 127.0 | awk '{print $2}' > /tmp/myip | ||
| MYIP=`cat /tmp/myip` | ||
|
|
||
| DEPLOYED_APP_URL=http://$MYIP:$PORT | ||
|
|
||
| echo app is deployed to $DEPLOYED_APP_URL, making sure it accepts connections | ||
|
|
||
|
|
||
| until [[ $(curl --silent --fail "$DEPLOYED_APP_URL/deployment.token" | grep "$DEPLOYMENT_TOKEN") ]]; do | ||
| sleep 2 | ||
| done | ||
| popd | ||
|
|
||
| docker rm -f metadata || echo "ready to run local cloud builder" | ||
|
|
||
| # run in cloud container builder | ||
| echo "Running integration tests on application that is deployed at $DEPLOYED_APP_URL" | ||
| echo `pwd` | ||
| container-builder-local \ | ||
| --config ${dir}/integration_test.yaml \ | ||
| --substitutions "_DEPLOYED_APP_URL=$DEPLOYED_APP_URL" \ | ||
| --dryrun=false \ | ||
| ${dir} |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
test-application/src/main/java/com/google/cloud/runtimes/ExceptionController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
test-application/src/main/java/com/google/cloud/runtimes/HelloController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
test-application/src/main/java/com/google/cloud/runtimes/LoggingTestController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package com.google.cloud.runtimes; | ||
|
|
||
| import com.google.cloud.MonitoredResource; | ||
| import com.google.cloud.logging.LogEntry; | ||
| import com.google.cloud.logging.Logging; | ||
| import com.google.cloud.logging.Payload; | ||
| import com.google.cloud.logging.Severity; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.context.annotation.Lazy; | ||
| import org.springframework.web.bind.annotation.RequestBody; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.logging.Logger; | ||
|
|
||
| import static org.springframework.web.bind.annotation.RequestMethod.POST; | ||
|
|
||
| @RestController | ||
| public class LoggingTestController { | ||
|
|
||
| @Autowired | ||
| @Lazy | ||
| private Logging logging; | ||
|
|
||
| private static Logger LOG = Logger.getLogger(LoggingTestController.class.getName()); | ||
|
|
||
| public static class LoggingTestRequest { | ||
| private String level; | ||
| private String log_name; | ||
| private String token; | ||
|
|
||
| public void setLevel(String level) { | ||
| this.level = level; | ||
| } | ||
|
|
||
| public void setLog_name(String log_name) { | ||
| this.log_name = log_name; | ||
| } | ||
|
|
||
| public void setToken(String token) { | ||
| this.token = token; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "LoggingTestRequest{" + | ||
| "level='" + level + '\'' + | ||
| ", log_name='" + log_name + '\'' + | ||
| ", token='" + token + '\'' + | ||
| '}'; | ||
| } | ||
| } | ||
|
|
||
| @RequestMapping(path = "/logging_custom", method = POST) | ||
| public String handleLoggingTestRequest(@RequestBody LoggingTestRequest loggingTestRequest) throws IOException, InterruptedException { | ||
| LOG.info(String.valueOf(loggingTestRequest)); | ||
|
|
||
| List<LogEntry> entries = new ArrayList<>(); | ||
| Payload.StringPayload payload = Payload.StringPayload.of(loggingTestRequest.token); | ||
| Severity severity = Severity.valueOf(loggingTestRequest.level); | ||
| LogEntry entry = LogEntry.newBuilder(payload) | ||
| .setSeverity(severity) | ||
| .setLogName(loggingTestRequest.log_name) | ||
| .setResource(MonitoredResource.newBuilder("global").build()) | ||
| .build(); | ||
| entries.add(entry); | ||
| logging.write(entries); | ||
| LOG.info("Log written to StackDriver: " + entries); | ||
| return "OK"; | ||
| } | ||
|
|
||
|
|
||
| } |
Oops, something went wrong.