Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make matomo.js and matomo.php the default Tracking API endpoints used #13596

Merged
merged 13 commits into from Nov 29, 2018

Conversation

tsteur
Copy link
Member

@tsteur tsteur commented Oct 11, 2018

fix #12785

  • Only for new installations we use matomo.js|matomo.php through the API as default. For older installations we use piwik.js|piwik.php. This way we won't break anything when tracking code is embedded automatically (eg the case on 70k+ wordpress installations).
  • The tracking code generator and "site without data" screens show the matomo endpoint though.
  • Custom Piwik JS plugin has now an alias command ./console custom-matomo-js:update(won't update the plugin as it may break things, is complicated, etc. lets do this in Matomo 4.0 Rename CustomPiwikJs plugin to CustomMatomoJs (or CustomTrackerJs) #13604)
  • The Custom JS plugin now updates /matomo.js and /piwik.js when generating the tracker file
  • The Custom JS plugin diagnostic check may check whether matomo.js and piwik.js is writable depending on when Matomo was installed
  • The Matomo endpoint can be enforced in the tracking API through a parameter (not really worth mentioning in the dev changelog as it is pretty much only for internal purposes).
  • Plugins that hook to Piwik.getJavascriptCode could now in theory rename the tracker endpoints matomo.js|php to anything else but the plugin would need to ensure those files exist etc.

We now also record the version number that was used to install Matomo so we can easier make changes in the future without breaking things for existing users.

@tsteur tsteur added the Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review. label Oct 11, 2018
@tsteur tsteur added this to the 3.7.0 milestone Oct 11, 2018
@tsteur
Copy link
Member Author

tsteur commented Oct 14, 2018

fyi created matomo-org/matomo-log-analytics#224

@tsteur tsteur added Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. and removed Pull Request WIP Indicates the current pull request is still work in progress and not ready yet for a review. labels Oct 14, 2018
CHANGELOG.md Outdated
@@ -4,6 +4,11 @@ This is the Developer Changelog for Matomo platform developers. All changes in o

The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)** lets you see more details about any Matomo release, such as the list of new guides and FAQs, security fixes, and links to all closed issues.

## Matomo 3.7.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to be updated.


/**
* Creates an entry in the User table for the "anonymous" user.
*/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think this & the above docblock needs to be changed or removed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 will update

tests/PHPUnit/proxy/misc Outdated Show resolved Hide resolved
@diosmosis
Copy link
Member

VisitorGenerator could probably use an update.

Otherwise looks good, conflicts need to be resolved though.

@tsteur
Copy link
Member Author

tsteur commented Nov 29, 2018

VisitorGenerator could probably use an update.

@diosmosis you mean to send to matomo.php? I'll create an issue on the repository to do this at the latest for Matomo 4.0 This way we don't need to increase the required version for now etc. and ensures the plugin continues to work even if they block matomo.php .

@diosmosis can you maybe look into matomo-org/matomo-log-analytics#224 ?

@diosmosis
Copy link
Member

Looking now

@tsteur
Copy link
Member Author

tsteur commented Nov 29, 2018

fyi created matomo-org/plugin-VisitorGenerator#35 and will also prepare a PR for visitor generator shortly (renaming of the log files takes quite a while...)

@diosmosis
Copy link
Member

@tsteur log importer PR: matomo-org/matomo-log-analytics#235 and submodule update PR: #13776

The submodule update's tests won't pass until this PR is merged.

@tsteur
Copy link
Member Author

tsteur commented Nov 29, 2018

UI tests should be fixed now. Merge conflicts resolved. Will probably merge soon if ok @diosmosis to avoid further conflicts

@diosmosis
Copy link
Member

no issue for me if you merge

@tsteur tsteur merged commit 7301059 into 3.x-dev Nov 29, 2018
@tsteur tsteur deleted the 12785_3 branch November 29, 2018 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make matomo.js and matomo.php the default Tracking API endpoints used
2 participants