WhichOneof instead of HasField

tammy-baylis-swi · tammy-baylis-swi · commit acc1c7c6f574 · 2025-07-14T16:51:14.000-07:00
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/metric_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/metric_exporter/__init__.py
@@ -348,7 +348,8 @@ def _split_metrics_data(
                     # with different accessors for data points, etc
                     # We maintain these structures throughout batch calculation
                     current_data_points = []
-                    if metric.HasField("sum"):
+                    field_name = metric.WhichOneof("data")
+                    if field_name == "sum":
                         split_metrics.append(
                             {
                                 "name": metric.name,
@@ -362,7 +363,7 @@ def _split_metrics_data(
                             }
                         )
                         current_data_points = metric.sum.data_points
-                    elif metric.HasField("histogram"):
+                    elif field_name == "histogram":
                         split_metrics.append(
                             {
                                 "name": metric.name,
@@ -375,7 +376,7 @@ def _split_metrics_data(
                             }
                         )
                         current_data_points = metric.histogram.data_points
-                    elif metric.HasField("exponential_histogram"):
+                    elif field_name == "exponential_histogram":
                         split_metrics.append(
                             {
                                 "name": metric.name,
@@ -390,7 +391,7 @@ def _split_metrics_data(
                         current_data_points = (
                             metric.exponential_histogram.data_points
                         )
-                    elif metric.HasField("gauge"):
+                    elif field_name == "gauge":
                         split_metrics.append(
                             {
                                 "name": metric.name,
@@ -402,7 +403,7 @@ def _split_metrics_data(
                             }
                         )
                         current_data_points = metric.gauge.data_points
-                    elif metric.HasField("summary"):
+                    elif field_name == "summary":
                         split_metrics.append(
                             {
                                 "name": metric.name,
@@ -436,7 +437,8 @@ def _split_metrics_data(
                             batch_size = 0
                             split_data_points = []
 
-                            if metric.HasField("sum"):
+                            field_name = metric.WhichOneof("data")
+                            if field_name == "sum":
                                 split_metrics = [
                                     {
                                         "name": metric.name,
@@ -449,7 +451,7 @@ def _split_metrics_data(
                                         },
                                     }
                                 ]
-                            elif metric.HasField("histogram"):
+                            elif field_name == "histogram":
                                 split_metrics = [
                                     {
                                         "name": metric.name,
@@ -461,7 +463,7 @@ def _split_metrics_data(
                                         },
                                     }
                                 ]
-                            elif metric.HasField("exponential_histogram"):
+                            elif field_name == "exponential_histogram":
                                 split_metrics = [
                                     {
                                         "name": metric.name,
@@ -473,7 +475,7 @@ def _split_metrics_data(
                                         },
                                     }
                                 ]
-                            elif metric.HasField("gauge"):
+                            elif field_name == "gauge":
                                 split_metrics = [
                                     {
                                         "name": metric.name,
@@ -484,7 +486,7 @@ def _split_metrics_data(
                                         },
                                     }
                                 ]
-                            elif metric.HasField("summary"):
+                            elif field_name == "summary":
                                 split_metrics = [
                                     {
                                         "name": metric.name,

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,8 @@ def _split_metrics_data(`
`348`	`348`	`# with different accessors for data points, etc`
`349`	`349`	`# We maintain these structures throughout batch calculation`
`350`	`350`	`current_data_points = []`
`351`		`- if metric.HasField("sum"):`
	`351`	`+ field_name = metric.WhichOneof("data")`
	`352`	`+ if field_name == "sum":`
`352`	`353`	`split_metrics.append(`
`353`	`354`	`{`
`354`	`355`	`"name": metric.name,`
`@@ -362,7 +363,7 @@ def _split_metrics_data(`
`362`	`363`	`}`
`363`	`364`	`)`
`364`	`365`	`current_data_points = metric.sum.data_points`
`365`		`- elif metric.HasField("histogram"):`
	`366`	`+ elif field_name == "histogram":`
`366`	`367`	`split_metrics.append(`
`367`	`368`	`{`
`368`	`369`	`"name": metric.name,`
`@@ -375,7 +376,7 @@ def _split_metrics_data(`
`375`	`376`	`}`
`376`	`377`	`)`
`377`	`378`	`current_data_points = metric.histogram.data_points`
`378`		`- elif metric.HasField("exponential_histogram"):`
	`379`	`+ elif field_name == "exponential_histogram":`
`379`	`380`	`split_metrics.append(`
`380`	`381`	`{`
`381`	`382`	`"name": metric.name,`
`@@ -390,7 +391,7 @@ def _split_metrics_data(`
`390`	`391`	`current_data_points = (`
`391`	`392`	`metric.exponential_histogram.data_points`
`392`	`393`	`)`
`393`		`- elif metric.HasField("gauge"):`
	`394`	`+ elif field_name == "gauge":`
`394`	`395`	`split_metrics.append(`
`395`	`396`	`{`
`396`	`397`	`"name": metric.name,`
`@@ -402,7 +403,7 @@ def _split_metrics_data(`
`402`	`403`	`}`
`403`	`404`	`)`
`404`	`405`	`current_data_points = metric.gauge.data_points`
`405`		`- elif metric.HasField("summary"):`
	`406`	`+ elif field_name == "summary":`
`406`	`407`	`split_metrics.append(`
`407`	`408`	`{`
`408`	`409`	`"name": metric.name,`
`@@ -436,7 +437,8 @@ def _split_metrics_data(`
`436`	`437`	`batch_size = 0`
`437`	`438`	`split_data_points = []`
`438`	`439`
`439`		`- if metric.HasField("sum"):`
	`440`	`+ field_name = metric.WhichOneof("data")`
	`441`	`+ if field_name == "sum":`
`440`	`442`	`split_metrics = [`
`441`	`443`	`{`
`442`	`444`	`"name": metric.name,`
`@@ -449,7 +451,7 @@ def _split_metrics_data(`
`449`	`451`	`},`
`450`	`452`	`}`
`451`	`453`	`]`
`452`		`- elif metric.HasField("histogram"):`
	`454`	`+ elif field_name == "histogram":`
`453`	`455`	`split_metrics = [`
`454`	`456`	`{`
`455`	`457`	`"name": metric.name,`
`@@ -461,7 +463,7 @@ def _split_metrics_data(`
`461`	`463`	`},`
`462`	`464`	`}`
`463`	`465`	`]`
`464`		`- elif metric.HasField("exponential_histogram"):`
	`466`	`+ elif field_name == "exponential_histogram":`
`465`	`467`	`split_metrics = [`
`466`	`468`	`{`
`467`	`469`	`"name": metric.name,`
`@@ -473,7 +475,7 @@ def _split_metrics_data(`
`473`	`475`	`},`
`474`	`476`	`}`
`475`	`477`	`]`
`476`		`- elif metric.HasField("gauge"):`
	`478`	`+ elif field_name == "gauge":`
`477`	`479`	`split_metrics = [`
`478`	`480`	`{`
`479`	`481`	`"name": metric.name,`
`@@ -484,7 +486,7 @@ def _split_metrics_data(`
`484`	`486`	`},`
`485`	`487`	`}`
`486`	`488`	`]`
`487`		`- elif metric.HasField("summary"):`
	`489`	`+ elif field_name == "summary":`
`488`	`490`	`split_metrics = [`
`489`	`491`	`{`
`490`	`492`	`"name": metric.name,`