make sure pop and push works

Author: AbhiPrasad

packages/react/src/reactrouter.tsx

@@ -76,8 +76,7 @@ function reactRouterInstrumentation(
 
     if (startTransactionOnLocationChange && history.listen) {
       history.listen((location, action) => {
-        // console.log(location, action);
-        if (action && action === 'PUSH') {
+        if (action && (action === 'PUSH' || action === 'POP')) {
           if (activeTransaction) {
             activeTransaction.finish();
           }
@@ -131,11 +130,9 @@ function computeRootMatch(pathname: string): Match {
   return { path: '/', url: '/', params: {}, isExact: pathname === '/' };
 }
 
-export const withSentryRouting = (Route: React.ElementType) => (props: any) => {
-  // tslint:disable: no-unsafe-any
+export const withSentryRouting = (Route: React.ElementType) => (props: { computedMatch?: Match }) => {
   if (activeTransaction && props && props.computedMatch && props.computedMatch.isExact) {
     activeTransaction.setName(props.computedMatch.path);
   }
   return <Route {...props} />;
-  // tslint:enable: no-unsafe-any
 };

packages/react/src/reactrouterv3.ts

@@ -41,9 +41,10 @@ export function reactRouterV3Instrumentation(
     let activeTransaction: Transaction | undefined;
     let prevName: string | undefined;
 
+    // Have to use global.location because history.location might not be defined.
     if (startTransactionOnPageLoad && global && global.location) {
-      // Have to use global.location because history.location might not be defined.
       prevName = normalizeTransactionName(routes, global.location, match);
+
       activeTransaction = startTransaction({
         name: prevName,
         op: 'pageload',
@@ -55,15 +56,14 @@ export function reactRouterV3Instrumentation(
 
     if (startTransactionOnLocationChange && history.listen) {
       history.listen(location => {
-        if (location.action === 'PUSH') {
+        if (location.action === 'PUSH' || location.action === 'POP') {
           if (activeTransaction) {
             activeTransaction.finish();
           }
           const tags: Record<string, string> = { 'routing.instrumentation': 'react-router-v3' };
           if (prevName) {
             tags.from = prevName;
           }
-
           prevName = normalizeTransactionName(routes, location, match);
           activeTransaction = startTransaction({
             name: prevName,