-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add RemoteLoggingHelper and integration tests #1111
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
126 changes: 126 additions & 0 deletions
126
gcloud-java-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.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,126 @@ | ||
/* | ||
* Copyright 2016 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. | ||
*/ | ||
|
||
package com.google.cloud.logging.testing; | ||
|
||
import com.google.cloud.AuthCredentials; | ||
import com.google.cloud.RetryParams; | ||
import com.google.cloud.logging.LoggingOptions; | ||
|
||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import java.util.UUID; | ||
import java.util.logging.Level; | ||
import java.util.logging.Logger; | ||
|
||
/** | ||
* Utility to create a remote logging configuration for testing. Logging options can be obtained via | ||
* the {@link #options()} method. Returned options have custom {@link LoggingOptions#retryParams()}: | ||
* {@link RetryParams#maxRetryDelayMillis()} is {@code 30000}, | ||
* {@link RetryParams#totalRetryPeriodMillis()} is {@code 120000} and | ||
* {@link RetryParams#initialRetryDelayMillis()} is {@code 250}. | ||
* {@link LoggingOptions#initialTimeout()} is set to 60000, {@link LoggingOptions#maxTimeout()} is | ||
* set to {@code 240000} and {@link LoggingOptions#timeoutMultiplier()} is set to {@code 1.5}. | ||
*/ | ||
public class RemoteLoggingHelper { | ||
|
||
private static final Logger log = Logger.getLogger(RemoteLoggingHelper.class.getName()); | ||
private final LoggingOptions options; | ||
|
||
private RemoteLoggingHelper(LoggingOptions options) { | ||
this.options = options; | ||
} | ||
|
||
/** | ||
* Returns a {@link LoggingOptions} object to be used for testing. | ||
*/ | ||
public LoggingOptions options() { | ||
return options; | ||
} | ||
|
||
/** | ||
* Creates a {@code RemoteLoggingHelper} object for the given project id and JSON key input | ||
* stream. | ||
* | ||
* @param projectId id of the project to be used for running the tests | ||
* @param keyStream input stream for a JSON key | ||
* @return A {@code RemoteLoggingHelper} object for the provided options | ||
* @throws com.google.cloud.logging.testing.RemoteLoggingHelper.LoggingHelperException if | ||
* {@code keyStream} is not a valid JSON key stream | ||
*/ | ||
public static RemoteLoggingHelper create(String projectId, InputStream keyStream) | ||
throws LoggingHelperException { | ||
try { | ||
LoggingOptions storageOptions = LoggingOptions.builder() | ||
.authCredentials(AuthCredentials.createForJson(keyStream)) | ||
.projectId(projectId) | ||
.retryParams(retryParams()) | ||
.initialTimeout(60000) | ||
.maxTimeout(120000) | ||
.timeoutMultiplier(1.5) | ||
.build(); | ||
return new RemoteLoggingHelper(storageOptions); | ||
} catch (IOException ex) { | ||
if (log.isLoggable(Level.WARNING)) { | ||
log.log(Level.WARNING, ex.getMessage()); | ||
} | ||
throw LoggingHelperException.translate(ex); | ||
} | ||
} | ||
|
||
/** | ||
* Creates a {@code RemoteLoggingHelper} object using default project id and authentication | ||
* credentials. | ||
*/ | ||
public static RemoteLoggingHelper create() throws LoggingHelperException { | ||
LoggingOptions loggingOptions = LoggingOptions.builder() | ||
.retryParams(retryParams()) | ||
.initialTimeout(60000) | ||
.maxTimeout(240000) | ||
.timeoutMultiplier(1.5) | ||
.build(); | ||
return new RemoteLoggingHelper(loggingOptions); | ||
} | ||
|
||
/** | ||
* Formats a resource name for testing purpose. This method appends a random UUID to the provided | ||
* name. | ||
*/ | ||
public static String formatForTest(String name) { | ||
return name + "-" + UUID.randomUUID().toString(); | ||
} | ||
|
||
private static RetryParams retryParams() { | ||
return RetryParams.builder() | ||
.maxRetryDelayMillis(30000) | ||
.totalRetryPeriodMillis(120000) | ||
.initialRetryDelayMillis(250) | ||
.build(); | ||
} | ||
|
||
public static class LoggingHelperException extends RuntimeException { | ||
|
||
private static final long serialVersionUID = 2617749404172557196L; | ||
|
||
public LoggingHelperException(String message, Throwable cause) { | ||
super(message, cause); | ||
} | ||
|
||
public static LoggingHelperException translate(Exception ex) { | ||
return new LoggingHelperException(ex.getMessage(), ex); | ||
} | ||
} | ||
} |
36 changes: 36 additions & 0 deletions
36
gcloud-java-logging/src/main/java/com/google/cloud/logging/testing/package-info.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,36 @@ | ||
/* | ||
* Copyright 2016 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. | ||
*/ | ||
|
||
/** | ||
* A testing helper for Stackdriver Logging. | ||
* | ||
* <p>A simple usage example: | ||
* | ||
* <p>Before the test: | ||
* <pre> {@code | ||
* RemoteLoggingHelper helper = RemoteLoggingHelper.create(); | ||
* Logging logging = helper.options().service(); | ||
* } </pre> | ||
* | ||
* <p>Format resource names to avoid name clashes: | ||
* <pre> {@code | ||
* String metricName = RemoteLoggingHelper.formatForTest("test-metric"); | ||
* } </pre> | ||
* | ||
* @see <a href="https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md#testing-code-that-uses-logging"> | ||
* gcloud-java tools for testing</a> | ||
*/ | ||
package com.google.cloud.logging.testing; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
Sorry, something went wrong.