Definition of a metonymy

Metonymy is often used in every day speech.
One of the examples of metonymy is to refer to the content by the container (ex: I drank a glass).
I was wondering if using the container to refer to the set that comprises the container and the content is considered a metonymy?
If not is there a word for it?