-
Notifications
You must be signed in to change notification settings - Fork 1.4k
feat: usage telemetry via scarf #8066
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
Merged
+179
−13
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| # the path to the data directory | ||
| data.directory=data/11.0 | ||
| odc.application.name=dependency-check-ant |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Telemetry | ||
|
|
||
| ## Scarf | ||
|
|
||
| OWASP dependency-check uses [Scarf](https://about.scarf.sh/) to collect anonymous usage data to help us understand how the software is being used and how we can improve it. You can opt out of telemetry collection by setting the environment variable `SCARF_NO_ANALYTICS` or `DO_NOT_TRACK` to `true`. |
93 changes: 93 additions & 0 deletions
93
utils/src/main/java/org/owasp/dependencycheck/utils/scarf/TelemetryCollector.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.owasp.dependencycheck.utils.scarf; | ||
|
|
||
| import org.owasp.dependencycheck.utils.Downloader; | ||
| import org.owasp.dependencycheck.utils.Settings; | ||
|
|
||
| import java.net.URL; | ||
| import java.net.URLEncoder; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
|
|
||
|
|
||
| /** | ||
| * A utility class to collect and send telemetry data to scarf. | ||
| * <p> | ||
| * Originally from https://github.com/apache/sedona/blob/4e4791d08ddafcf0b46c3d2c092f750eb5dcf2ef/common/src/main/java/org/apache/sedona/common/utils/TelemetryCollector.java#L26 | ||
| */ | ||
| public class TelemetryCollector { | ||
|
|
||
| private static final String BASE_URL = "https://dependency-check.gateway.scarf.sh/scan/"; | ||
| private static final AtomicBoolean telemetrySubmitted = new AtomicBoolean(false); | ||
|
|
||
| public static void send(Settings settings) { | ||
| try { | ||
| String tool = settings.getString(Settings.KEYS.APPLICATION_NAME, "dependency-check"); | ||
| String version = settings.getString(Settings.KEYS.APPLICATION_VERSION, "Unknown"); | ||
| send(settings, tool, version); | ||
| } catch (Exception e) { | ||
| // Silent catch block | ||
| } | ||
| } | ||
| public static void send(Settings settings, String tool, String version) { | ||
| if (!telemetrySubmitted.compareAndSet(false, true)) { | ||
| return; | ||
| } | ||
| // Check for user opt-out | ||
| if (System.getenv("SCARF_NO_ANALYTICS") != null | ||
| && System.getenv("SCARF_NO_ANALYTICS").equalsIgnoreCase("true") | ||
| || System.getenv("DO_NOT_TRACK") != null | ||
| && System.getenv("DO_NOT_TRACK").equalsIgnoreCase("true") | ||
| || System.getProperty("SCARF_NO_ANALYTICS") != null | ||
| && System.getProperty("SCARF_NO_ANALYTICS").equalsIgnoreCase("true") | ||
| || System.getProperty("DO_NOT_TRACK") != null | ||
| && System.getProperty("DO_NOT_TRACK").equalsIgnoreCase("true")) { | ||
| return; | ||
| } | ||
| try { | ||
| URL telemetryUrl = new URL(BASE_URL | ||
| + URLEncoder.encode(tool, StandardCharsets.UTF_8) | ||
| + "/" | ||
| + URLEncoder.encode(version, StandardCharsets.UTF_8)); | ||
| Thread telemetryThread = createThread(settings, telemetryUrl); | ||
| telemetryThread.start(); | ||
| } catch (Exception e) { | ||
| // Silent catch block | ||
| } | ||
| } | ||
|
|
||
| private static Thread createThread(Settings settings, URL url) { | ||
| Thread telemetryThread = | ||
| new Thread("telemetry-thread") { | ||
| @Override | ||
| public void run() { | ||
| try { | ||
| Downloader downloader = Downloader.getInstance(); | ||
| downloader.configure(settings); | ||
| downloader.fetchContent(url, StandardCharsets.UTF_8); | ||
| } catch (Exception e) { | ||
| // Silent catch block | ||
| } | ||
| } | ||
| }; | ||
| telemetryThread.setDaemon(true); | ||
| return telemetryThread; | ||
| } | ||
| } | ||
33 changes: 33 additions & 0 deletions
33
utils/src/test/java/org/owasp/dependencycheck/utils/scarf/TelemetryCollectorTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.owasp.dependencycheck.utils.scarf; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.owasp.dependencycheck.utils.BaseTest; | ||
| import org.owasp.dependencycheck.utils.Settings; | ||
|
|
||
| class TelemetryCollectorTest extends BaseTest { | ||
|
|
||
| @Test | ||
| void testSendTelemetry() throws InterruptedException { | ||
| String version = getSettings().getString(Settings.KEYS.APPLICATION_VERSION, "Unknown"); | ||
| TelemetryCollector.send(getSettings(), "build", version); | ||
| Thread.sleep(1000); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.