Fix : moving instance_name logging to log entry label by jabubake · Pull Request #2011 · googleapis/google-cloud-java · GitHub

#1994 removing unsupported resource labels for standard, flex
Adding instance_name to log entries instead of resource for Flex.
@meltsufin

removing unsupported resource labels for standard, flex

Changes Unknown when pulling 7d2d3ef on jabubake:flex_logging_fix into ** on GoogleCloudPlatform:master**.

@gregw PTAL

@meltsufin I've build @jabubake's branch locally and run the GoogleCloudPlatform/jetty-runtime#81 against it. The exception is gone and I can see the correct logs in the console - however the remote tests are failing as the logs are not being found by the API calls the test has made, so perhaps the filter is now wrong against the labels used.

tl;dr; It's fixed the #1994 issue but I need to check if other labels are missing.

Greg, Mike, The trace id label is now just trace_id , I noticed the naming was done more in the format of logging v1 labels, so I moved them to v2 style with URL not being in the label name. I also wanted to set it standardized to not be tied to app engine in the URL. Let me know if this is an issue

…

On Thu, Apr 27, 2017 at 9:22 AM Greg Wilkins ***@***.***> wrote: @meltsufin <https://github.com/meltsufin> I've build @jabubake <https://github.com/jabubake>'s branch locally and run the GoogleCloudPlatform/jetty-runtime#81 <GoogleCloudPlatform/jetty-runtime#81> against it. The exception is gone and I can see the correct logs in the console - however the remote tests are failing as the logs are not being found by the API calls the test has made, so perhaps the filter is now wrong against the labels used. tl;dr; It's fixed the #1994 <#1994> issue but I need to check if other labels are missing. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2011 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AWfpWyBNbKAVTji4Twy8W-iOQvEqWOhfks5r0MDggaJpZM4NJi-k> .

@jabubake Ah thanks. Updating my tests and redeploying now...

@jabubake @meltsufin the branch works fine with my tests now that I have updated the traceId and instance_name checks.

However, I do not know if the shorter name will prevent the log console from matching the nginx log entries (which still use the long name) with the gae_log entries. The matching is currently not working for other reasons so I cannot test.

@meltsufin , @gregw : given the complexity, I'll update this for now to be in sync with what used to exist. We can take the rename to shorter v2 type versions in a separate CL.

@jabubake Sounds good, thanks!

@gregw @meltsufin : let me know if this will do

Changes Unknown when pulling 51131e4 on jabubake:flex_logging_fix into ** on GoogleCloudPlatform:master**.

@garrettjonesgoogle : the changes address the bug fix to resource labels and also reverting to the currently supported Stackdriver API name for trace_id. ptal.

@vam-google I added some comments - could you finish the review?

removing redundant code

Changes Unknown when pulling 33bccbd on jabubake:flex_logging_fix into ** on GoogleCloudPlatform:master**.

@vam-google ping :)

LGTM, all comments are optional but please consider making the suggested changes.

LGTM (posting 2 more comments)

Changes Unknown when pulling 8936d80 on jabubake:flex_logging_fix into ** on GoogleCloudPlatform:master**.

Changes Unknown when pulling bf7b47b on jabubake:flex_logging_fix into ** on GoogleCloudPlatform:master**.

LGTM

Changes Unknown when pulling c2fc97a on jabubake:flex_logging_fix into ** on GoogleCloudPlatform:master**.

…v3.54.2 (#2011)

…storage to v2.34.0 (#2011) * chore(deps): update dependency com.google.cloud:google-cloud-bigquerystorage to v2.34.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

…v3.54.2 (#2011)

…#2011)

🤖 I have created a release *beep* *boop* --- ## [1.129.3](https://togithub.com/googleapis/java-pubsub/compare/v1.129.2...v1.129.3) (2024-05-06) ### Dependencies * Update dependency com.google.cloud:google-cloud-core to v2.38.0 ([#2011](https://togithub.com/googleapis/java-pubsub/issues/2011)) ([4a547d0](https://togithub.com/googleapis/java-pubsub/commit/4a547d08d02f3abaf23bfb8e5ed65e40c131bb94)) * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#2012](https://togithub.com/googleapis/java-pubsub/issues/2012)) ([811d0e6](https://togithub.com/googleapis/java-pubsub/commit/811d0e609b5eb6eaf9c921828255407d9db68293)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

…#2011)

🤖 I have created a release *beep* *boop* --- ## [1.129.3](https://togithub.com/googleapis/java-pubsub/compare/v1.129.2...v1.129.3) (2024-05-06) ### Dependencies * Update dependency com.google.cloud:google-cloud-core to v2.38.0 ([#2011](https://togithub.com/googleapis/java-pubsub/issues/2011)) ([ed2b28f](https://togithub.com/googleapis/java-pubsub/commit/ed2b28f989ce04d8d47bb1ddcd69dc80d7953d67)) * Update dependency com.google.cloud:sdk-platform-java-config to v3.30.0 ([#2012](https://togithub.com/googleapis/java-pubsub/issues/2012)) ([b9acea1](https://togithub.com/googleapis/java-pubsub/commit/b9acea11f1213357e4322e444cfff32172891e1e)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).

…v3.43.0 (#2011) * deps: update dependency com.google.cloud:sdk-platform-java-config to v3.43.0 * chore: Use otel-semconv version in shared-deps * chore: Fix GraalVM Issue * chore: Fix GraalVM Issue * chore: Fix GraalVM Issue --------- Co-authored-by: Lawrence Qiu <lawrenceqiu@google.com>

moving instance_name logging to log entry label

7d2d3ef

removing unsupported resource labels for standard, flex

jabubake requested a review from garrettjonesgoogle April 26, 2017 23:28

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Apr 26, 2017

adding app engine specific label prefix to instance_name, trace_id

51131e4

jabubake mentioned this pull request Apr 28, 2017

We are writing "trace_id" label, but when searching for request log lines, Stackdriver sends requests looking for "appengine.googleapis.com/trace_id". #2009

Closed

garrettjonesgoogle reviewed Apr 28, 2017

View reviewed changes

formatting, visibilty fixes

33bccbd

removing redundant code

vam-google approved these changes May 1, 2017

View reviewed changes

jabubake added 2 commits May 1, 2017 14:39

fixing perf, concurrent update issues

8936d80

renaming get to create for clarity

bf7b47b

vam-google approved these changes May 2, 2017

View reviewed changes

jabubake added 2 commits May 2, 2017 10:18

adding private final

535f422

Merge remote-tracking branch 'upstream/master' into flex_logging_fix

c2fc97a

jabubake merged commit ae51932 into googleapis:master May 2, 2017

jabubake deleted the flex_logging_fix branch May 2, 2017 17:46

chingor13 pushed a commit that referenced this pull request Jan 22, 2026

deps: update dependency com.google.cloud:sdk-platform-java-config to …

c2062e7

…v3.54.2 (#2011)

lqiu96 pushed a commit that referenced this pull request Mar 20, 2026

deps: update dependency com.google.cloud:sdk-platform-java-config to …

3c5b016

…v3.54.2 (#2011)

meltsufin pushed a commit that referenced this pull request Apr 29, 2026

deps: update dependency com.google.cloud:google-cloud-core to v2.38.0 (…

4a547d0

…#2011)

meltsufin pushed a commit that referenced this pull request May 1, 2026

deps: update dependency com.google.cloud:google-cloud-core to v2.38.0 (…

ed2b28f

…#2011)

                     // Trace logging enhancer is supported on GAE Flex and Standard.
-                    case GaeAppStandard:
                     case GaeAppFlex:
                       enhancers = new ArrayList<>();

+                 *  are restricted to a supported set per resource.
+                 *  @see <a href="https://cloud.google.com/logging/docs/api/v2/resource-list">Logging Labels</a>
+                 */
+                static class LabelLoggingEnhancer implements LoggingEnhancer {

+                      enhancers.add(new TraceLoggingEnhancer(APPENGINE_LABEL_PREFIX));
                       break;
                     default:
                       enhancers = Collections.emptyList();

+                 *  are restricted to a supported set per resource.
+                 *  @see <a href="https://cloud.google.com/logging/docs/api/v2/resource-list">Logging Labels</a>
+                 */
+                private static class LabelLoggingEnhancer implements LoggingEnhancer {

                   }
                 }
+                private static String appEngineLabelPrefix = "appengine.googleapis.com/";

               /* Adds tracing support for logging with thread-local trace ID tracking. */
               public class TraceLoggingEnhancer implements LoggingEnhancer {
+                String prefix;

                 private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {
-                  List<LoggingEnhancer> enhancers;
+                  List<LoggingEnhancer> enhancers = new ArrayList<>();

		@@ -193,18 +195,47 @@ private static String getAppEngineInstanceName() {
		}

		private static List<LoggingEnhancer> getEnhancers(Resource resourceType) {

+                  String prefix;
+                  List<Label> labels;
+                  LabelLoggingEnhancer(String prefix, List<Label> labels) {

Fix : moving instance_name logging to log entry label by jabubake · Pull Request #2011 · googleapis/google-cloud-java · GitHub

Navigation Menu

Uh oh!

Fix : moving instance_name logging to log entry label - #2011

Fix : moving instance_name logging to log entry label#2011jabubake merged 7 commits intogoogleapis:mastergoogleapis/google-cloud-java:masterfrom jabubake:flex_logging_fixjabubake/google-cloud-java:flex_logging_fixCopy head branch name to clipboard

Conversation

jabubake commented Apr 26, 2017

Uh oh!

coveralls commented Apr 26, 2017

Uh oh!

meltsufin commented Apr 27, 2017

Uh oh!

gregw commented Apr 27, 2017

Uh oh!

jabubake commented Apr 27, 2017 via email

Uh oh!

gregw commented Apr 27, 2017

Uh oh!

gregw commented Apr 27, 2017

Uh oh!

jabubake commented Apr 28, 2017

Uh oh!

meltsufin commented Apr 28, 2017

Uh oh!

jabubake commented Apr 28, 2017

Uh oh!

coveralls commented Apr 28, 2017

Uh oh!

jabubake commented Apr 28, 2017

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

garrettjonesgoogle commented Apr 28, 2017

Uh oh!

coveralls commented Apr 28, 2017

Uh oh!

jabubake commented May 1, 2017

Uh oh!

vam-google left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

vam-google left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

coveralls commented May 1, 2017

Uh oh!

Fix : moving instance_name logging to log entry label#2011
jabubake merged 7 commits into
googleapis:masterfrom
jabubake:flex_logging_fix