Skip to content

Commit

Permalink
send to segment, not google anayltics (JBIDE-28396) (#760)
Browse files Browse the repository at this point in the history
* copied intellij-telemetry & made it compile (JBIDE-28396)
* send to segment, not google anayltics (JBIDE-28396)
* removed deprecated portions (JBIDE-28396)
* bump to version 2.3.0
* removed branding (JBIDE-28396)
* renamed IEclipseUserAgent & other browser remains (JBIDE-28396)
* removed page path in EventSender
* added 'copied from' to class headers
* corrected urls to https://
* create new builder each time new msg is created
* have identify traits of JBT not clash with IntelliJ

Signed-off-by: Andre Dietisheim <[email protected]>

---------

Signed-off-by: Andre Dietisheim <[email protected]>
  • Loading branch information
adietish authored Jun 22, 2023
1 parent f3e851c commit 66e01f4
Show file tree
Hide file tree
Showing 109 changed files with 5,219 additions and 2,705 deletions.
2 changes: 1 addition & 1 deletion jacoco-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<plugins.version.runtime>3.5.300-SNAPSHOT</plugins.version.runtime>
<plugins.version.stacks>1.4.200-SNAPSHOT</plugins.version.stacks>
<plugins.version.tests>3.7.103-SNAPSHOT</plugins.version.tests>
<plugins.version.usage>2.2.500-SNAPSHOT</plugins.version.usage>
<plugins.version.usage>2.3.0-SNAPSHOT</plugins.version.usage>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion usage/features/org.jboss.tools.usage.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.usage.feature"
label="%featureName"
version="2.2.500.qualifier"
version="2.3.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.usage"
license-feature="org.jboss.tools.foundation.license.feature"
Expand Down
2 changes: 1 addition & 1 deletion usage/features/org.jboss.tools.usage.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.usage</groupId>
<artifactId>features</artifactId>
<version>2.2.500-SNAPSHOT</version>
<version>2.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.usage.features</groupId>
<artifactId>org.jboss.tools.usage.feature</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.usage.test.feature"
label="%featureName"
version="2.2.500.qualifier"
version="2.3.0.qualifier"
provider-name="%providerName"
license-feature="org.jboss.tools.foundation.license.feature"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion usage/features/org.jboss.tools.usage.test.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.usage</groupId>
<artifactId>features</artifactId>
<version>2.2.500-SNAPSHOT</version>
<version>2.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.usage.features</groupId>
<artifactId>org.jboss.tools.usage.test.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion usage/features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>usage</artifactId>
<version>2.2.500-SNAPSHOT</version>
<version>2.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.usage</groupId>
<artifactId>features</artifactId>
Expand Down
14 changes: 12 additions & 2 deletions usage/plugins/org.jboss.tools.usage/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="resources/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/analytics-2.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/analytics-core-2.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/okhttp-4.9.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gson-2.10.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/kotlin-stdlib-1.8.22.jar"/>
<classpathentry exported="true" kind="lib" path="lib/okio-jvm-3.3.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/retrofit1-okhttp3-client-1.1.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/retrofit-1.9.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/backo-1.0.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
6 changes: 6 additions & 0 deletions usage/plugins/org.jboss.tools.usage/.project
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
Expand Down
26 changes: 19 additions & 7 deletions usage/plugins/org.jboss.tools.usage/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,39 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundle-name
Bundle-SymbolicName: org.jboss.tools.usage;singleton:=true
Bundle-Version: 2.2.500.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Version: 2.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.jboss.tools.usage.branding,
org.jboss.tools.usage.event,
org.jboss.tools.usage.googleanalytics,
org.jboss.tools.usage.internal.environment.eclipse;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.internal;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.internal.branding;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.internal.event;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.internal.http;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.internal.preferences;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.internal.reporting;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.internal.environment;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.tracker,
org.jboss.tools.usage.tracker.internal;x-friends:="org.jboss.tools.usage.test",
org.jboss.tools.usage.util,
org.jboss.tools.usage.util.reader
Import-Package: com.fasterxml.jackson.core,
com.fasterxml.jackson.core.type,
com.fasterxml.jackson.databind
Require-Bundle: org.eclipse.osgi;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)"
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
com.fasterxml.jackson.core.jackson-core;bundle-version="2.13.2",
com.fasterxml.jackson.core.jackson-databind;bundle-version="2.13.2"
Bundle-Activator: org.jboss.tools.usage.internal.JBossToolsUsageActivator
Bundle-ClassPath: .,
lib/analytics-2.1.1.jar,
lib/analytics-core-2.1.1.jar,
lib/okhttp-4.9.3.jar,
lib/gson-2.10.1.jar,
lib/kotlin-stdlib-1.8.22.jar,
lib/okio-jvm-3.3.0.jar,
lib/retrofit1-okhttp3-client-1.1.0.jar,
lib/retrofit-1.9.0.jar,
lib/backo-1.0.0.jar,
resources/
Bundle-Vendor: %bundle-vendor
Bundle-ActivationPolicy: lazy

Expand Down
8 changes: 6 additions & 2 deletions usage/plugins/org.jboss.tools.usage/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ bin.includes = .,\
META-INF/,\
OSGI-INF/,\
.options,\
icons/,\
icons/,\
about.html,\
about.mappings,\
about.properties,\
jboss_about.png
jboss_about.png,\
lib/,\
resources/timezones.json,\
resources/segment-defaults.properties,\
resources/
src.includes = about.html,\
pom.xml
source.. = src/
82 changes: 81 additions & 1 deletion usage/plugins/org.jboss.tools.usage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,89 @@
<parent>
<groupId>org.jboss.tools.usage</groupId>
<artifactId>plugins</artifactId>
<version>2.2.500-SNAPSHOT</version>
<version>2.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.usage.plugins</groupId>
<artifactId>org.jboss.tools.usage</artifactId>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>get-deps-lib</id>
<goals>
<goal>copy</goal>
</goals>
<phase>generate-resources</phase>
</execution>
</executions>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.segment.analytics.java</groupId>
<artifactId>analytics</artifactId>
<version>2.1.1</version>
</artifactItem>
<artifactItem>
<groupId>com.segment.analytics.java</groupId>
<artifactId>analytics-core</artifactId>
<version>2.1.1</version>
</artifactItem>
<artifactItem>
<groupId>com.segment.backo</groupId>
<artifactId>backo</artifactId>
<version>1.0.0</version>
</artifactItem>
<artifactItem>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</artifactItem>
<artifactItem>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.9.3</version>
</artifactItem>
<artifactItem>
<groupId>com.jakewharton.retrofit</groupId>
<artifactId>retrofit1-okhttp3-client</artifactId>
<version>1.1.0</version>
</artifactItem>
<artifactItem>
<groupId>com.squareup.retrofit</groupId>
<artifactId>retrofit</artifactId>
<version>1.9.0</version>
</artifactItem>
<artifactItem>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>1.8.22</version>
</artifactItem>
<artifactItem>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<version>3.3.0</version>
</artifactItem>
</artifactItems>
<skip>
false</skip>
<outputDirectory>${basedir}/lib/</outputDirectory>
</configuration>
</plugin>
<plugin>
<!-- make sure lib dir is removed after clean to avoid "dirty" build -->
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>${basedir}/lib</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
writeKey=kCHAlE4frD0qQ78sifKKFDQN9afdWlSI
debugWriteKey=XettED4GDNiwfFmkenRrVnEZZMc2aIZi
Loading

0 comments on commit 66e01f4

Please sign in to comment.