Skip to content

Commit ac1806d

Browse files
committed
Remove container resource detector that has not been published
1 parent 49b6c23 commit ac1806d

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ dependencies = [
3333
"opentelemetry-instrumentation-system-metrics == 0.49b2",
3434
"opentelemetry-resourcedetector-gcp ~= 1.7.0a0",
3535
"opentelemetry-resource-detector-azure ~= 0.1.5",
36-
"opentelemetry-resource-detector-container ~= 0.49b2",
3736
"opentelemetry-sdk == 1.28.2",
3837
"opentelemetry-sdk-extension-aws ~= 2.0.2",
3938
"opentelemetry-semantic-conventions == 0.49b2",

src/elasticotel/distro/resource_detectors.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
AWS_LAMBDA_DETECTORS = ["aws_lambda"]
2020
AZURE_FUNCTIONS_DETECTORS = ["azure_functions"]
2121
GCP_CLOUD_RUN_DETECTORS = ["_gcp"]
22-
KUBERNETES_DETECTORS = ["_gcp", "aws_eks", "container"]
22+
KUBERNETES_DETECTORS = ["_gcp", "aws_eks"]
2323
OTHER_CLOUD_DETECTORS = [
2424
"_gcp",
2525
"aws_ec2",
2626
"aws_ecs",
2727
"aws_elastic_beanstalk",
2828
"azure_app_service",
2929
"azure_vm",
30-
"container",
3130
]
3231

3332

tests/distro/test_distro.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def test_default_configuration(self):
4242
self.assertEqual("otlp", os.environ.get(OTEL_LOGS_EXPORTER))
4343
self.assertEqual("grpc", os.environ.get(OTEL_EXPORTER_OTLP_PROTOCOL))
4444
self.assertEqual(
45-
"process_runtime,os,otel,telemetry_distro,_gcp,aws_ec2,aws_ecs,aws_elastic_beanstalk,azure_app_service,azure_vm,container",
45+
"process_runtime,os,otel,telemetry_distro,_gcp,aws_ec2,aws_ecs,aws_elastic_beanstalk,azure_app_service,azure_vm",
4646
os.environ.get(OTEL_EXPERIMENTAL_RESOURCE_DETECTORS),
4747
)
4848
self.assertEqual("always_off", os.environ.get(OTEL_METRICS_EXEMPLAR_FILTER))

tests/distro/test_resource_detectors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ def test_gcp_cloud_run(self):
3838
@mock.patch.dict("os.environ", {"KUBERNETES_SERVICE_HOST": "k8s"}, clear=True)
3939
def test_kubernetes_pod(self):
4040
resource_detectors = get_cloud_resource_detectors()
41-
self.assertEqual(resource_detectors, ["_gcp", "aws_eks", "container"])
41+
self.assertEqual(resource_detectors, ["_gcp", "aws_eks"])
4242

4343
@mock.patch.dict("os.environ", {}, clear=True)
4444
def test_other_cloud_detectors(self):
4545
resource_detectors = get_cloud_resource_detectors()
4646
self.assertEqual(
4747
resource_detectors,
48-
["_gcp", "aws_ec2", "aws_ecs", "aws_elastic_beanstalk", "azure_app_service", "azure_vm", "container"],
48+
["_gcp", "aws_ec2", "aws_ecs", "aws_elastic_beanstalk", "azure_app_service", "azure_vm"],
4949
)

0 commit comments

Comments
 (0)