Skip to content

Commit 72ab612

Browse files
vogellavogella
committed
Drop the Eclipse Foundation from the upload dialog and the terms
The upload dialog still said the data goes to a server at the Eclipse Foundation and linked to eclipse.org pages that no longer exist. It now names the configured upload location and links to the GitHub repository and its user guide. The terms of use, shown from the dialog and in the help, describe the collector without naming an operator: the data goes to whoever runs the configured upload location. The help pages say the same.
1 parent df165b0 commit 72ab612

6 files changed

Lines changed: 92 additions & 160 deletions

File tree

‎org.eclipse.epp.usagedata.ui/html/gettingstarted/how_does_it_work.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@ <h1>How Does it Work?</h1>
7373

7474
<p align="center"><img src="UploadingPrefs.png" /></p>
7575

76-
<p>The target for uploads is a server hosted by The Eclipse Foundation.
77-
The data is stored in its collected form in a foundation database.</p>
76+
<p>The target for uploads is the upload location configured on the
77+
&quot;Usage Data Collection | Uploading&quot; preferences page. The
78+
operator of that location stores the data in its collected form.</p>
7879

7980
<p>Two different keys are used to identify the source of the uploaded
8081
data. The first key identifies the workstation; this key is stored

‎org.eclipse.epp.usagedata.ui/html/gettingstarted/terms.html‎

Lines changed: 41 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -19,88 +19,54 @@
1919
</head>
2020
<body>
2121
<h1>Usage Data Collector Terms of Use</h1>
22-
<p>This document describes
23-
how the Eclipse Foundation will treat the data provided by
24-
individuals and organizations through the Eclipse Usage Collector.
25-
</p>
22+
<p>This document describes what the Usage Data Collector records and what
23+
happens to the data you choose to upload.</p>
2624
<ul>
27-
<li>A unique id is
28-
generated for every workstation (or Eclipse workspace) that submits
29-
data using the Usage Data Collector. This session id is transmitted every
30-
time data is sent to the Eclipse Foundation.</li>
31-
<li>The Eclipse
32-
Foundation does not intend for the Usage Data Collector to collect
33-
information that can uniquely identify you as an individual.
34-
However, it may inadvertently collect information that is included
35-
in plug-in names, which information may identify an individual or
36-
organization. </li>
37-
<li>The data that is
38-
being collected relates to how you are using Eclipse and any
39-
third-party plug-ins that you have added to your Eclipse workspace.
40-
This includes, but is not limited to, information on plug-in names,
41-
version numbers, length of time spent in a specific editor/view or
42-
perspective, actions and commands that you invoked, etc. You can
43-
imagine it to be similar to &quot;click stream&quot; data that is
44-
collected at certain web sites.</li>
45-
<li>The Usage Data Collector
46-
may collect and transmit the country where you are located. You
47-
may also optionally specify general demographic information.
48-
</li>
25+
<li>A unique id is generated for every workstation and for every
26+
workspace that submits data. These ids are random, contain nothing
27+
about you, and are transmitted with every upload so that uploads from
28+
the same installation can be told apart from others.</li>
29+
<li>The Usage Data Collector is not intended to collect information
30+
that identifies you as an individual. It may inadvertently pick up
31+
such information where it appears in plug-in names.</li>
32+
<li>The data relates to how you use the application and the plug-ins
33+
installed in it: plug-in names and versions, the time spent in a
34+
specific editor, view or perspective, the actions and commands you
35+
invoked, and similar events. Think of it as the &quot;click stream&quot;
36+
that some web sites record.</li>
4937
</ul>
5038
<h2>Uses of the Information</h2>
5139
<ul>
52-
<li>The Eclipse
53-
Foundation may, in its sole discretion, make available to
54-
organizations and individuals, on a case-by case-basis, the data
55-
that it collects through the Usage Data Collector, whether in raw or
56-
aggregated form.
57-
</li>
58-
<li>The Eclipse
59-
Foundation will publish summary reports based on the data obtained.
60-
These reports will be made available in machine readable format that
61-
will allow individuals and organizations to undertake further
62-
analysis.</li>
63-
<li>Potential uses of
64-
the summary reports may include, but not limited to: 1) Eclipse
65-
project committers who want to better understand how individuals are
66-
using their projects, 2) usage of Eclipse projects and third-party
67-
Eclipse plug-ins, and 3) an estimate to the number of individuals
68-
using Eclipse. It is expected that the summary reports and raw data
69-
may be used for other purposes that we have not envisioned at this
70-
point in time.</li>
40+
<li>The data is sent to the upload location configured on the
41+
&quot;Usage Data Collector | Uploading&quot; preferences page. The
42+
organization that operates that location receives the data in its
43+
collected form and may use it, in raw or aggregated form, to
44+
understand how the application and its plug-ins are used and how many
45+
people use them.</li>
46+
<li>Ask the operator of the configured upload location how the data is
47+
stored, for how long, and with whom it is shared.</li>
7148
</ul>
72-
73-
<h2>Interactions with
74-
the Usage Data Collector</h2>
75-
49+
<h2>Interactions with the Usage Data Collector</h2>
7650
<ul>
77-
<li>With your
78-
permission, the Usage Data Collector will periodically transmit your usage
79-
data to the Eclipse Foundation. The first time it attempts to
80-
transmit the data, you will be requested to grant permission of
81-
transmission. If you decline the request, the Usage Data Collector will
82-
stop functioning, until you decide to re-enable it. If you grant
83-
permission, you will have the option of allowing the Usage Data Collector
84-
to automatically transmit data without further interaction or to
85-
request your permission each time it attempts to transmit data.</li>
86-
<li>You can choose to
87-
limit the range of plug-ins on which the Usage Data Collector collects
88-
information. You may limit the list of plug-ins to be only those
89-
that are provided by the Eclipse Foundation. In addition, you may
90-
exclude plug-ins that include a specific text string in their name.
91-
To limit the range of plug-in, go to the &quot;Usage Data Collection | Preview&quot;
92-
page in the workspace preferences and add one or more filters.</li>
93-
<li> At anytime, you
94-
may view the data that is being collected. To view your current
95-
information, go to the
96-
&quot;Usage Data Collection | Preview&quot; preferences page.</li>
97-
<li>After providing
98-
your initial permission, you may discontinue use of the Usage
99-
Monitor by turning off the &quot;Enable Capture&quot; checkbox
100-
on the &quot;Usage Data Collection&quot; preferences page.</li>
51+
<li>With your permission, the Usage Data Collector periodically
52+
transmits your usage data. The first time it attempts to do so, you
53+
are asked for permission. If you decline, the collector stops until
54+
you enable it again. If you agree, you can let it upload automatically
55+
without further interaction, or have it ask you before every upload.</li>
56+
<li>You can limit what is recorded. The plug-ins can be restricted to
57+
those from the Eclipse namespace, plug-ins whose name contains a given
58+
text can be excluded, and bundle lifecycle events are left out by
59+
default. The filters are on the &quot;Usage Data Collector&quot;
60+
preferences pages.</li>
61+
<li>At any time, you may view the data that has been collected on the
62+
&quot;Usage Data Collector | Preview&quot; preferences page.</li>
63+
<li>You may stop collecting at any time by turning off the
64+
&quot;Enable Capture&quot; checkbox on the &quot;Usage Data
65+
Collector&quot; preferences page.</li>
10166
</ul>
10267
<h2>More Information</h2>
103-
<p>If you have any questions or would like additional information about the Eclipse
104-
Usage Data Collector, please contact eclipse_udc@eclipse.org.</p>
68+
<p>The source code, documentation and issue tracker of the Usage Data
69+
Collector are at
70+
<a href="https://github.com/vogellacompany/org.eclipse.epp.usagedata">https://github.com/vogellacompany/org.eclipse.epp.usagedata</a>.</p>
10571
</body>
10672
</html>

‎org.eclipse.epp.usagedata.ui/html/toc.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<h1>The Usage Data Collector</h1>
2323
<p>The Usage Data Collector collects information about how individuals
2424
are using the Eclipse platform. This information is periodically
25-
uploaded to servers hosted by The Eclipse Foundation. The intent is to
26-
use this data to help committers and organizations better understand how
27-
developers are using Eclipse.</p>
25+
uploaded to the configured upload location. The intent is to use this
26+
data to help the people who build the application understand how it is
27+
used.</p>
2828
<h3>Targeted Users of the Data:</h3>
2929
<ul>
3030
<li>Users of Eclipse</li>

‎org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/SelectActionWizardPage.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@
3232

3333
public class SelectActionWizardPage extends WizardPage {
3434

35-
// TODO Replace with proper values
36-
private static final String UDC_URL = "http://www.eclipse.org/org/usagedata/index.php"; //$NON-NLS-1$
37-
private static final String FAQ_URL = "http://www.eclipse.org/org/usagedata/faq.php"; //$NON-NLS-1$
35+
private static final String UDC_URL = "https://github.com/vogellacompany/org.eclipse.epp.usagedata"; //$NON-NLS-1$
36+
private static final String FAQ_URL = "https://github.com/vogellacompany/org.eclipse.epp.usagedata/blob/main/docs/user-guide.md"; //$NON-NLS-1$
3837

3938
private static final int WIDTH_HINT = 500;
4039

‎org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/messages.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SelectActionWizardPage_16=Turn UDC feature off
88
SelectActionWizardPage_17=Stop collecting data. The UDC will be turned off and data will never be uploaded.
99
SelectActionWizardPage_3=Usage Data Upload
1010
SelectActionWizardPage_4=It's time to upload your usage data.
11-
SelectActionWizardPage_5=<form><p>The Eclipse <a href="udc">Usage Data Collector</a> (UDC) collects data on how you have been using the workbench. It would now like to upload the data to a server at the Eclipse Foundation. No data is sent unless you agree.</p><p>You can preview the data before it is uploaded on the <a href="preview">Preview page</a>.</p><p>Questions about the UDC? Check out our <a href="faq">Frequently Asked Questions</a>.</p></form>
11+
SelectActionWizardPage_5=<form><p>The <a href="udc">Usage Data Collector</a> (UDC) collects data on how you have been using the workbench. It would now like to upload the data to the configured upload location. No data is sent unless you agree.</p><p>You can preview the data before it is uploaded on the <a href="preview">Preview page</a>.</p><p>Questions about the UDC? Check out the <a href="faq">User Guide</a>.</p></form>
1212
SelectActionWizardPage_9=<form><p>You agree to provide this data under the Usage Data Collector <a href="terms">Terms of Use</a>.</p></form>
1313
TermsOfUseWizardPage_1=Terms of Use
1414
TermsOfUseWizardPage_2=I accept the Terms of Use

‎org.eclipse.epp.usagedata.ui/terms.html‎

Lines changed: 42 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -11,88 +11,54 @@
1111
</style>
1212
<body>
1313
<h1>Usage Data Collector Terms of Use</h1>
14-
<p>This document describes
15-
how the Eclipse Foundation will treat the data provided by
16-
individuals and organizations through the Eclipse Usage Collector.
17-
</p>
14+
<p>This document describes what the Usage Data Collector records and what
15+
happens to the data you choose to upload.</p>
1816
<ul>
19-
<li>A unique id is
20-
generated for every workstation (or Eclipse workspace) that submits
21-
data using the Usage Data Collector. This session id is transmitted every
22-
time data is sent to the Eclipse Foundation.</li>
23-
<li>The Eclipse
24-
Foundation does not intend for the Usage Data Collector to collect
25-
information that can uniquely identify you as an individual.
26-
However, it may inadvertently collect information that is included
27-
in plug-in names, which information may identify an individual or
28-
organization. </li>
29-
<li>The data that is
30-
being collected relates to how you are using Eclipse and any
31-
third-party plug-ins that you have added to your Eclipse workspace.
32-
This includes, but is not limited to, information on plug-in names,
33-
version numbers, length of time spent in a specific editor/view or
34-
perspective, actions and commands that you invoked, etc. You can
35-
imagine it to be similar to &quot;click stream&quot; data that is
36-
collected at certain web sites.</li>
37-
<li>The Usage Data Collector
38-
may collect and transmit the country where you are located. You
39-
may also optionally specify general demographic information.
40-
</li>
17+
<li>A unique id is generated for every workstation and for every
18+
workspace that submits data. These ids are random, contain nothing
19+
about you, and are transmitted with every upload so that uploads from
20+
the same installation can be told apart from others.</li>
21+
<li>The Usage Data Collector is not intended to collect information
22+
that identifies you as an individual. It may inadvertently pick up
23+
such information where it appears in plug-in names.</li>
24+
<li>The data relates to how you use the application and the plug-ins
25+
installed in it: plug-in names and versions, the time spent in a
26+
specific editor, view or perspective, the actions and commands you
27+
invoked, and similar events. Think of it as the &quot;click stream&quot;
28+
that some web sites record.</li>
4129
</ul>
4230
<h2>Uses of the Information</h2>
4331
<ul>
44-
<li>The Eclipse
45-
Foundation may, in its sole discretion, make available to
46-
organizations and individuals, on a case-by case-basis, the data
47-
that it collects through the Usage Data Collector, whether in raw or
48-
aggregated form.
49-
</li>
50-
<li>The Eclipse
51-
Foundation will publish summary reports based on the data obtained.
52-
These reports will be made available in machine readable format that
53-
will allow individuals and organizations to undertake further
54-
analysis.</li>
55-
<li>Potential uses of
56-
the summary reports may include, but not limited to: 1) Eclipse
57-
project committers who want to better understand how individuals are
58-
using their projects, 2) usage of Eclipse projects and third-party
59-
Eclipse plug-ins, and 3) an estimate to the number of individuals
60-
using Eclipse. It is expected that the summary reports and raw data
61-
may be used for other purposes that we have not envisioned at this
62-
point in time.</li>
32+
<li>The data is sent to the upload location configured on the
33+
&quot;Usage Data Collector | Uploading&quot; preferences page. The
34+
organization that operates that location receives the data in its
35+
collected form and may use it, in raw or aggregated form, to
36+
understand how the application and its plug-ins are used and how many
37+
people use them.</li>
38+
<li>Ask the operator of the configured upload location how the data is
39+
stored, for how long, and with whom it is shared.</li>
6340
</ul>
64-
65-
<h2>Interactions with
66-
the Usage Data Collector</h2>
67-
41+
<h2>Interactions with the Usage Data Collector</h2>
6842
<ul>
69-
<li>With your
70-
permission, the Usage Data Collector will periodically transmit your usage
71-
data to the Eclipse Foundation. The first time it attempts to
72-
transmit the data, you will be requested to grant permission of
73-
transmission. If you decline the request, the Usage Data Collector will
74-
stop functioning, until you decide to re-enable it. If you grant
75-
permission, you will have the option of allowing the Usage Data Collector
76-
to automatically transmit data without further interaction or to
77-
request your permission each time it attempts to transmit data.</li>
78-
<li>You can choose to
79-
limit the range of plug-ins on which the Usage Data Collector collects
80-
information. You may limit the list of plug-ins to be only those
81-
that are provided by the Eclipse Foundation. In addition, you may
82-
exclude plug-ins that include a specific text string in their name.
83-
To limit the range of plug-in, go to the &quot;Usage Data Collection | Preview&quot;
84-
page in the workspace preferences and add one or more filters.</li>
85-
<li> At anytime, you
86-
may view the data that is being collected. To view your current
87-
information, go to the
88-
&quot;Usage Data Collection | Preview&quot; preferences page.</li>
89-
<li>After providing
90-
your initial permission, you may discontinue use of the Usage
91-
Monitor by turning off the &quot;Enable Capture&quot; checkbox
92-
on the &quot;Usage Data Collection&quot; preferences page.</li>
43+
<li>With your permission, the Usage Data Collector periodically
44+
transmits your usage data. The first time it attempts to do so, you
45+
are asked for permission. If you decline, the collector stops until
46+
you enable it again. If you agree, you can let it upload automatically
47+
without further interaction, or have it ask you before every upload.</li>
48+
<li>You can limit what is recorded. The plug-ins can be restricted to
49+
those from the Eclipse namespace, plug-ins whose name contains a given
50+
text can be excluded, and bundle lifecycle events are left out by
51+
default. The filters are on the &quot;Usage Data Collector&quot;
52+
preferences pages.</li>
53+
<li>At any time, you may view the data that has been collected on the
54+
&quot;Usage Data Collector | Preview&quot; preferences page.</li>
55+
<li>You may stop collecting at any time by turning off the
56+
&quot;Enable Capture&quot; checkbox on the &quot;Usage Data
57+
Collector&quot; preferences page.</li>
9358
</ul>
9459
<h2>More Information</h2>
95-
<p>If you have any questions or would like additional information about the Eclipse
96-
Usage Data Collector, please contact eclipse_udc@eclipse.org.</p>
60+
<p>The source code, documentation and issue tracker of the Usage Data
61+
Collector are at
62+
<a href="https://github.com/vogellacompany/org.eclipse.epp.usagedata">https://github.com/vogellacompany/org.eclipse.epp.usagedata</a>.</p>
9763
</body>
98-
</html>
64+
</html>

0 commit comments

Comments
 (0)