Skip to content

fix(logging): appengine zone label#3998

Merged
gcf-merge-on-green[bot] merged 3 commits intomasterfrom
gaeEnvDetection
May 3, 2021
Merged

fix(logging): appengine zone label#3998
gcf-merge-on-green[bot] merged 3 commits intomasterfrom
gaeEnvDetection

Conversation

@freelerobot
Copy link
Copy Markdown
Contributor

@freelerobot freelerobot commented Apr 23, 2021

Fixes: #3919

Before:

resource: {
  type: "gae_app"
  labels: {
    project_id: "log-bench"
    module_id: "default"
    zone: ""
    version_id: "20201113t135702"
  }
}

After:

resource: {
  type: "gae_app"
  labels: {
    project_id: "log-bench"
    module_id: "default"
    zone: "us-west-a"
    version_id: "20201113t135702"
  }
}

e2e environment tests for this change passing at env-tests

=========================================== test session starts ===========================================
platform darwin -- Python 3.7.9, pytest-6.2.3, py-1.10.0, pluggy-0.13.1
rootdir: /Users/nicolezhu/Desktop/google-cloud-go/internal/env-tests-logging
collected 3 items

tests/go/test_appengine_standard.py ['/Users/nicolezhu/Desktop/google-cloud-go/internal/env-tests-logging/envctl/envctl', 'go', 'appengine_standard', 'verify']
['/Users/nicolezhu/Desktop/google-cloud-go/internal/env-tests-logging/envctl/envctl', 'go', 'appengine_standard', 'deploy']
['/Users/nicolezhu/Desktop/google-cloud-go/internal/env-tests-logging/envctl/envctl', 'go', 'appengine_standard', 'verify']
['/Users/nicolezhu/Desktop/google-cloud-go/internal/env-tests-logging/envctl/envctl', 'go', 'appengine_standard', 'trigger', 'simplelog', 'log_text="test_monitored_resource d3654c60-a3d4-11eb-bb1c-acde48001122"']
.['/Users/nicolezhu/Desktop/google-cloud-go/internal/env-tests-logging/envctl/envctl', 'go', 'appengine_standard', 'trigger', 'simplelog', 'log_text="test_receive_log de86ea86-a3d4-11eb-bb1c-acde48001122"']
..

====================================== 3 passed in 176.73s (0:02:56) ======================================
nox > Session tests(language='go', platform='appengine_standard') was successful.

@freelerobot freelerobot self-assigned this Apr 23, 2021
@product-auto-label product-auto-label Bot added the api: logging Issues related to the Cloud Logging API. label Apr 23, 2021
@google-cla google-cla Bot added the cla: yes This human has signed the Contributor License Agreement. label Apr 23, 2021
@freelerobot freelerobot marked this pull request as ready for review April 23, 2021 01:46
@freelerobot freelerobot requested review from a team April 23, 2021 01:46
Copy link
Copy Markdown
Member

@codyoss codyoss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@freelerobot freelerobot added the automerge Merge the pull request once unit tests and other checks pass. label May 3, 2021
@gcf-merge-on-green gcf-merge-on-green Bot merged commit 394a586 into master May 3, 2021
@gcf-merge-on-green gcf-merge-on-green Bot deleted the gaeEnvDetection branch May 3, 2021 03:22
@gcf-merge-on-green gcf-merge-on-green Bot removed the automerge Merge the pull request once unit tests and other checks pass. label May 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api: logging Issues related to the Cloud Logging API. cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

logging: support resource detection for app engine flex

2 participants