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

Allow GCS config for setting attributes on new objects #1368

Merged
merged 13 commits into from Apr 12, 2022

Conversation

zalegrala
Copy link
Contributor

@zalegrala zalegrala commented Apr 7, 2022

What this PR does:

Here we add two options to configure GCS object attributes. One to control the aspects of object caching, and the other to allow users to specify metadata on the object.

Which issue(s) this PR fixes:
Fixes #1348

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

tempodb/backend/gcs/gcs.go Outdated Show resolved Hide resolved
@zalegrala
Copy link
Contributor Author

zalegrala commented Apr 8, 2022

Looks like I was wrong about the default yaml unmarshaling tags for the upstream config object, perhaps because the underlying type is an interface. I think we'll probably want to build a config for the features we plan to support. Thought, using the default lowercase name for the yaml field does seem to work. This would be simpler than translating between the objects. Integration tests will soon tell us something.

@zalegrala zalegrala force-pushed the gcsObjectAttributes branch 2 times, most recently from 96c1d91 to dc2af8a Compare April 11, 2022 15:37
tempodb/backend/gcs/config.go Outdated Show resolved Hide resolved
tempodb/backend/gcs/gcs.go Outdated Show resolved Hide resolved
integration/e2e/config-all-in-one-gcs.yaml Outdated Show resolved Hide resolved
@zalegrala zalegrala force-pushed the gcsObjectAttributes branch 2 times, most recently from 880f6de to 9d33c11 Compare April 11, 2022 16:26
Copy link
Member

@joe-elliott joe-elliott left a comment

Choose a reason for hiding this comment

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

looks good! a few final things to clean up. also can you regenerate the config in manifest.md?

tempodb/backend/gcs/config.go Outdated Show resolved Hide resolved
docs/tempo/website/configuration/_index.md Outdated Show resolved Hide resolved
@zalegrala zalegrala merged commit 90956fc into grafana:main Apr 12, 2022
@zalegrala zalegrala deleted the gcsObjectAttributes branch April 12, 2022 15:03
zalegrala added a commit to zalegrala/tempo that referenced this pull request Apr 12, 2022
@zalegrala zalegrala mentioned this pull request Apr 12, 2022
1 task
zalegrala added a commit to zalegrala/tempo that referenced this pull request Apr 12, 2022
zalegrala added a commit that referenced this pull request Apr 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Configuring GCS Metadata
3 participants