V.W.
Just for informational purposes... If he calms "the second you go in there" then it is NOT night terrors.
Be very careful about how you handle this. If he has always been a good sleeper, don't put a fly in the ointment by letting him get in your bed with you.. You'll foment other problems. I see that the Benadryl worked. Please don't use that more than a couple of times. If you have to do so, then there is something else that needs to be addressed.
You did not say what his normal sleep habits are. Does he fall asleep at night by himself (i.e., do you put him in his crib still slightly awake?). If not, then that is more likely the root of the problem. He is waking (for whatever reason, be it teething, or the sensation of wetting his diaper, or whatever) and is unable to soothe himself back to sleep. Then he is scared or upset and screams for you. You come running. Solve everything. Then when he is asleep, he wakes again (for whatever reason) and you aren't there anymore! It's dark! He's not in your arms- he's in a crib alone! So he screams..... you come running... etc etc etc. Notice a pattern? It is subtle when we experience it, because we don't want our baby to be upset, so we are doing what we naturally do... but, if you think about it, it is obvious. We have trained them to need US to go to sleep. So if they wake, they have no ability to do anything but scream for us. If you haven't done any of it, sleep training is what you need to look at. Trust me. With our first, I didn't have a clue. But when he was 18 months I thought I would lose my mind trying to get him to go to sleep at night. When his little sister came along, we did things differently and the effect was night and day.
I hope I don't sound "preachy".. I just want to help. You need some rest with #2 coming.. and you will need to have this issue with #1 resolved or you will be a wreck with BOTH of them waking during the night.
Putting him into bed still slightly awake (not alert and wide awake, but "dozy" not asleep yet) will help him learn how to go to sleep on his own. Then when he wakes during the night, he can go back to sleep on his own again- without screaming for mommy to rescue him and without mommy having to crawl out of bed to come rock him or whatever.
Good luck.
Blessings on your soon to be born baby girl!