Remove helper

components/camera/client.go

@@ -244,15 +244,19 @@ func (c *client) NextPointCloud(ctx context.Context) (pointcloud.PointCloud, err
 
 	ctx, getPcdSpan := trace.StartSpan(ctx, "camera::client::NextPointCloud::GetPointCloud")
 
-	ext, err := data.GetExtraFromContext(ctx)
+	extra := make(map[string]interface{})
+	if ctx.Value(data.FromDMContextKey{}) == true {
+		extra[data.FromDMString] = true
+	}
+	extraStruct, err := goprotoutils.StructToStructPb(extra)
 	if err != nil {
 		return nil, err
 	}
 
 	resp, err := c.client.GetPointCloud(ctx, &pb.GetPointCloudRequest{
 		Name:     c.name,
 		MimeType: utils.MimeTypePCD,
-		Extra:    ext,
+		Extra:    extraStruct,
 	})
 	getPcdSpan.End()
 	if err != nil {

data/collector.go

@@ -383,13 +383,3 @@ func InvalidInterfaceErr(api resource.API) error {
 func FailedToReadErr(component, method string, err error) error {
 	return errors.Errorf("failed to get reading of method %s of component %s: %v", method, component, err)
 }
-
-// GetExtraFromContext sets the extra struct with "fromDataManagement": true if the flag is true in the context.
-// Deprecated: Use camera.FromContext instead.
-func GetExtraFromContext(ctx context.Context) (*structpb.Struct, error) {
-	extra := make(map[string]interface{})
-	if ctx.Value(FromDMContextKey{}) == true {
-		extra[FromDMString] = true
-	}
-	return protoutils.StructToStructPb(extra)
-}