Skip to content

Map non-GKE Kubernetes resources #524

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.

Sign up for GitHub

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

Open
Haihan-Jiang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Map non-GKE Kubernetes resources #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,7 @@ def get_monitored_resource(
attrs = resource.attributes

platform = attrs.get(ResourceAttributes.CLOUD_PLATFORM_KEY)
if platform == ResourceAttributes.GCP_COMPUTE_ENGINE:
mr = _create_monitored_resource(_constants.GCE_INSTANCE, attrs)
elif platform == ResourceAttributes.GCP_KUBERNETES_ENGINE:
if ResourceAttributes.K8S_CLUSTER_NAME in attrs:
if ResourceAttributes.K8S_CONTAINER_NAME in attrs:
mr = _create_monitored_resource(_constants.K8S_CONTAINER, attrs)
elif ResourceAttributes.K8S_POD_NAME in attrs:
Expand All @@ -168,6 +166,8 @@ def get_monitored_resource(
mr = _create_monitored_resource(_constants.K8S_NODE, attrs)
else:
mr = _create_monitored_resource(_constants.K8S_CLUSTER, attrs)
elif platform == ResourceAttributes.GCP_COMPUTE_ENGINE:
mr = _create_monitored_resource(_constants.GCE_INSTANCE, attrs)
elif platform == ResourceAttributes.AWS_EC2:
mr = _create_monitored_resource(_constants.AWS_EC2_INSTANCE, attrs)
else:
Expand Down
80 changes: 80 additions & 0 deletions opentelemetry-resourcedetector-gcp/tests/test_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,86 @@
from syrupy.assertion import SnapshotAssertion


@pytest.mark.parametrize(
("otel_attributes", "expected_type", "expected_labels"),
[
pytest.param(
{
"cloud.platform": "aws_ec2",
"cloud.region": "us-east-1",
"k8s.cluster.name": "mycluster",
"k8s.namespace.name": "myns",
"k8s.pod.name": "mypod",
"k8s.container.name": "mycontainer",
},
"k8s_container",
{
"location": "us-east-1",
"cluster_name": "mycluster",
"namespace_name": "myns",
"pod_name": "mypod",
"container_name": "mycontainer",
},
id="container",
),
pytest.param(
{
"cloud.platform": "aws_ec2",
"cloud.region": "us-east-1",
"k8s.cluster.name": "mycluster",
"k8s.namespace.name": "myns",
"k8s.pod.name": "mypod",
},
"k8s_pod",
{
"location": "us-east-1",
"cluster_name": "mycluster",
"namespace_name": "myns",
"pod_name": "mypod",
},
id="pod",
),
pytest.param(
{
"cloud.platform": "aws_ec2",
"cloud.region": "us-east-1",
"k8s.cluster.name": "mycluster",
"k8s.node.name": "mynode",
},
"k8s_node",
{
"location": "us-east-1",
"cluster_name": "mycluster",
"node_name": "mynode",
},
id="node",
),
pytest.param(
{
"cloud.platform": "aws_ec2",
"cloud.region": "us-east-1",
"k8s.cluster.name": "mycluster",
},
"k8s_cluster",
{"location": "us-east-1", "cluster_name": "mycluster"},
id="cluster",
),
],
)
def test_get_monitored_resource_non_gke_k8s(
otel_attributes: Attributes,
expected_type: str,
expected_labels: dict[str, str],
) -> None:
monitored_resource = get_monitored_resource(
Resource.create(otel_attributes)
)

assert monitored_resource is not None
assert monitored_resource.type == expected_type
assert monitored_resource.labels == expected_labels


@pytest.mark.parametrize(
"otel_attributes",
[
Expand Down