Author: adietish Date: 2010-08-27 12:09:56 -0400 (Fri, 27 Aug 2010) New Revision: 24511 Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java Log: [JBIDE-6881] request produce no hits any more, trying to fix Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-27 15:47:41 UTC (rev 24510) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-27 16:09:56 UTC (rev 24511) @@ -158,9 +158,7 @@ .append("999.") .append(googleParameters.getFirstVisit()) .append(IGoogleAnalyticsParameters.DOT) - .append("1.1.") - , IGoogleAnalyticsParameters.SEMICOLON - , IGoogleAnalyticsParameters.PLUS_SIGN) + .append("1.1.")) .appendTo(builder); // new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_SESSION, Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 15:47:41 UTC (rev 24510) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/UsageReport.java 2010-08-27 16:09:56 UTC (rev 24511) @@ -44,11 +44,13 @@ private static final String HOST_NAME = ReportingMessages.UsageReport_HostName; - private FocusPoint focusPoint = new FocusPoint("tools") //$NON-NLS-1$ - .setChild(new FocusPoint("usage") //$NON-NLS-1$ - .setChild(new FocusPoint("action") //$NON-NLS-1$ - .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$ +// private FocusPoint focusPoint = new FocusPoint("tools") //$NON-NLS-1$ +// .setChild(new FocusPoint("usage") //$NON-NLS-1$ +// .setChild(new FocusPoint("action") //$NON-NLS-1$ +// .setChild(new FocusPoint("wsstartup")))); //$NON-NLS-1$ + private FocusPoint focusPoint = new FocusPoint("pureTest"); //$NON-NLS-1$ + private GlobalUsageReportingSettings globalSettings = new GlobalUsageReportingSettings(JBossToolsUsageActivator .getDefault()); Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-08-27 15:47:41 UTC (rev 24510) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-08-27 16:09:56 UTC (rev 24511) @@ -61,14 +61,15 @@ @Test public void differentUserIdOnDifferentEclipseInstance() throws Exception { + String focusPointName = "testDifferentUserIdOnDifferentEclipseInstance" + + System.currentTimeMillis(); UrlRevealingTracker tracker = getTracker(createEclipseEnvironment()); - tracker.trackSynchronously(createFocusPoint("")); + tracker.trackSynchronously(createFocusPoint(focusPointName)); String userId = getUserId(tracker.getTrackingUrl()); assertTrue(userId != null); tracker = getTracker(createEclipseEnvironment()); - FocusPoint focusPoint = createFocusPoint("testDifferentUserIdOnDifferentEclipseInstance" - + System.currentTimeMillis()); + FocusPoint focusPoint = createFocusPoint(focusPointName); tracker.trackSynchronously(focusPoint); String newUserId = getUserId(tracker.getTrackingUrl()); @@ -76,6 +77,17 @@ assertTrue(!userId.equals(newUserId)); } + @Test + public void visitCountIncreases() throws Exception { + IGoogleAnalyticsParameters eclipseEnvironment = createEclipseEnvironment(); + assertEquals(1, eclipseEnvironment.getVisitCount()); + UrlRevealingTracker tracker = getTracker(eclipseEnvironment); + tracker.trackSynchronously(createFocusPoint("testVisitCount")); + assertEquals(2, eclipseEnvironment.getVisitCount()); + tracker.trackSynchronously(createFocusPoint("testVisitCount")); + assertEquals(3, eclipseEnvironment.getVisitCount()); + } + private String getUserId(String trackingUrl) { Pattern pattern = Pattern.compile(".+" + IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID + "%3D([0-9]+\\.[0-9]+)\\..+"); Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java =================================================================== --- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-27 15:47:41 UTC (rev 24510) +++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageRequestsTest.java 2010-08-27 16:09:56 UTC (rev 24511) @@ -801,6 +801,70 @@ assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); } + /** + * this test should create a request from the same eclipse instance later in + * time (visit count increased, visit timestamps updated, userId identical) + */ + @Test + public void testUrl_debug_utma() throws IOException { + String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter); + String url = "http://www.google-analytics.com/__utm.gif?" + + "utmwv=4.7.2" + + "&utmn=15176694" + + "&utmhn=jboss.org" + + "&utmcs=UTF-8" + + "&utmsr=1920x1080" + + "&utmsc=24-bit" + + "&utmul=en-us" + + "&utmdt=tools-usage-testUrl_utmaCookies_utmb_utmc_1" + + "&utmhid=1087431432" + + "&utmp=%2Ftools%2Fusage%2FtestUrl_utmaCookies_utmb_utmc_1" + + "&utmac=UA-17645367-1" + + "&utmcc=" + + "__utma%3D999.5737734690471263281282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B" + + "__utmb%3D1%3B%2B" + + "__utmc%3D1%3B%2B" + + "__utmz%3D156030500.1281430767.1.1." + + "utmcsr%3D(direct)%7C" + + "utmccn%3D(direct)%7C" + + "utmcmd%3D(none)%7C" + + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B" + + "&gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } + + @Test + public void testUrl_utma_utmz() throws IOException { + String userAgent = "com.jboss.jbds.product/3.0.1 (Windows; U; Windows NT 6.1; en-US)"; + TestHttpGetMethod method = new TestHttpGetMethod(userAgent, loggingAdapter); + String url = "http://www.google-analytics.com/__utm.gif?" + + "utmwv=4.7.2" + + "&utmn=15176694" + + "&utmhn=jboss.org" + + "&utmcs=UTF-8" + + "&utmsr=1920x1080" + + "&utmsc=24-bit" + + "&utmul=en-us" + + "&utmdt=tools-usage-testUrl_utmaCookies_utmb_utmc_1" + + "&utmhid=1087431432" + + "&utmp=%2Ftools%2Fusage%2FtestUrl_utmaCookies_utmb_utmc_1" + + "&utmac=UA-17645367-1" + + "&utmcc=" + + "__utma%3D999.5737734690471263281282924103927.1282924103925.1282924103925.1282924103925.1%3B%2B" + + "__utmb%3D1%3B%2B" + + "__utmc%3D1%3B%2B" + + "__utmz%3D999.1282924103925.1.1." + + "utmcsr%3D(direct)%7C" + + "utmccn%3D(direct)%7C" + + "utmcmd%3D(none)%7C" + + "utmctr%3Dtest1%7Ctest2%7Ctest3%7Ctest4%7Ctest5%7Ctest6%7Ctest7%7Ctest8%7Ctest8%7Ctest9%7Ctest10%7Ctest11%7Ctest12%7Ctest13%7Ctest514%7Ctest14%7Ctest15%7Ctest16%7Ctest17%7Ctest18%7Ctest19%7Ctest20%7Ctest20%7Ctest21%7Ctest22%7Ctest23%7Ctest514%7Ctest24%7Ctest25%7Ctest26%7Ctest27%7Ctest28%7Ctest29%7Ctest30%7Ctest31%3B" + + "&gaq=1"; + method.request(url); + assertEquals(HttpURLConnection.HTTP_OK, method.getResponseCode()); + } + protected class TestHttpGetMethod extends HttpGetRequest { private HttpURLConnection urlConnection;