Skip to content
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

fix(logging): appengine zone label #3998

Merged
merged 3 commits into from May 3, 2021
Merged

Conversation

0xSage
Copy link
Contributor

@0xSage 0xSage 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.

@0xSage 0xSage 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
@0xSage 0xSage marked this pull request as ready for review Apr 23, 2021
@0xSage 0xSage requested review from a team as code owners Apr 23, 2021
Copy link
Member

@codyoss codyoss left a comment

LGTM

@0xSage 0xSage 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
3 checks passed
@gcf-merge-on-green gcf-merge-on-green bot deleted the gaeEnvDetection branch May 3, 2021
@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