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

Collect labels and annotations from manifest #808

Merged
merged 13 commits into from
Dec 2, 2024

Conversation

turytsia
Copy link
Contributor

@turytsia turytsia commented Nov 26, 2024

  • Labels and annotations are now set to resource.attributes
  • kvlistValue was removed
  • k8s_instrumentation config is ignored
{
    "resource": {
        "attributes": [
            {
                "key": "k8s.namespace.name",
                "value": {
                    "stringValue": "default"
                }
            },
            {
                "key": "k8s.deployment.name",
                "value": {
                    "stringValue": "test-deployment"
                }
            },
            {
                "key": "k8s.deployment.annotations.alex",
                "value": {
                    "stringValue": "test"
                }
            },
            {
                "key": "k8s.deployment.labels.hello",
                "value": {
                    "stringValue": "world"
                }
            },
            ...
        ]
    },
    "scopeLogs": [...]
}

@turytsia turytsia requested a review from a team as a code owner November 26, 2024 14:17
Copy link
Contributor

@gantrior gantrior left a comment

Choose a reason for hiding this comment

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

I guess those failures in CI are not random. Tests are checking if the telemetry have labels and annotations in it and you are removing it: https://github.com/solarwinds/swi-k8s-opentelemetry-collector/blob/master/tests/integration/expected_telemetry/deployment.json#L22-L23. So you will need to update those expected telemetry in tests.

@pstranak-sw pstranak-sw force-pushed the collect-labels-and-annotations-from-manifests branch from fffb45a to 2e0a8b6 Compare November 29, 2024 11:54
@gantrior gantrior merged commit efdf6d0 into master Dec 2, 2024
19 checks passed
@gantrior gantrior deleted the collect-labels-and-annotations-from-manifests branch December 2, 2024 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

4 participants