It's the more general term for either one. One can be upset because one is offended or because one is disappointed. Offense and disappointment are two different possible causes of upset.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.