Merge branch 'main' into taldekar/PreferencesTelemetryFix

README.md

@@ -1,10 +1,18 @@
 ## Amazon Q for Eclipse
 
-To be written.
+Amazon Q Developer helps users build faster across the entire software development lifecycle by providing tailored responses and code recommendations that conform to their team's internal libraries, proprietary algorithmic techniques, and enterprise code style.
 
-## Security
+### Getting Started
 
-See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more information.
+* **Free Tier** - create or log in with an AWS Builder ID (a personal profile from AWS).
+* **Pro Tier** - if your organization is on the Amazon Q Developer Pro tier, log in with single sign-on.
+
+### Features
+
+* Code faster with inline code suggestions - Amazon Q Developer generates real-time code suggestions ranging from snippets to full functions based on your comments and existing code. It also supports CLI completions and natural language–to-bash translation in the command line.
+* Get assistance - Amazon Q Developer can generate code, explain code, and provide answers about software development.
+* Customize code recommendations - Securely connect Amazon Q Developer to your private repositories to generate even more relevant code recommendations, ask questions about your company code, and understand your internal code bases faster.
+* Code reference log - Attribute code from Amazon Q that is similar to training data. When code suggestions similar to training data are accepted, they will be added to the code reference log.
 
 ## License
 

feature/feature.xml

@@ -1,23 +1,203 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="amazon-q-eclipse-feature"
+      id="software.aws.toolkits.eclipse.amazonq.feature"
       label="Amazon Q for Eclipse"
       version="1.0.0.qualifier">
 
    <description>
-      This is an example feature for the example plug-in implementation.
+      Amazon Q Developer helps users build faster across the entire software development lifecycle by providing tailored responses and code recommendations that conform to their team's internal libraries, proprietary algorithmic techniques, and enterprise code style.
    </description>
 
-   <license url="">
-    To be disclosed
+   <copyright>
+      Amazon Q for Eclipse
+      Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+   </copyright>
+
+   <license url="http://aws.amazon.com/apache2.0">
+            Apache License
+      Version 2.0, January 2004
+   http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
+===================================================================
+
+https://github.com/aws/amazon-q-eclipse/blob/main/attribution.xml
    </license>
 
    <plugin
          id="amazon-q-eclipse"
-
-         download-size="0"
+         download-size="11000"
          install-size="0"
          version="1.0.0.qualifier"
-
          unpack="false"/>
 </feature>

feature/pom.xml

@@ -11,7 +11,7 @@
   </parent>
 
   <groupId>software.aws.toolkits.eclipse</groupId>
-  <artifactId>amazon-q-eclipse-feature</artifactId>
+  <artifactId>software.aws.toolkits.eclipse.amazonq.feature</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 

plugin/META-INF/MANIFEST.MF

@@ -35,9 +35,7 @@ Bundle-Classpath: target/classes/,
  target/dependency/checksums-spi-2.28.26.jar,
  target/dependency/cognitoidentity-2.28.26.jar,
  target/dependency/commons-codec-1.17.1.jar,
- target/dependency/commons-logging-1.2.jar,
  target/dependency/endpoints-spi-2.28.26.jar,
- target/dependency/eventstream-1.0.1.jar,
  target/dependency/http-auth-2.28.26.jar,
  target/dependency/http-auth-aws-2.28.26.jar,
  target/dependency/http-auth-aws-eventstream-2.28.26.jar,
@@ -46,25 +44,13 @@ Bundle-Classpath: target/classes/,
  target/dependency/httpclient-4.5.14.jar,
  target/dependency/httpcore-4.4.16.jar,
  target/dependency/identity-spi-2.28.26.jar,
- target/dependency/jackson-annotations-2.17.1.jar,
  target/dependency/jackson-annotations-2.17.2.jar,
- target/dependency/jackson-core-2.17.1.jar,
  target/dependency/jackson-core-2.17.2.jar,
  target/dependency/jackson-databind-2.17.2.jar,
  target/dependency/jakarta.inject-api-2.0.1.jar,
  target/dependency/json-utils-2.28.26.jar,
  target/dependency/metrics-spi-2.28.26.jar,
- target/dependency/netty-buffer-4.1.112.Final.jar,
- target/dependency/netty-codec-4.1.112.Final.jar,
- target/dependency/netty-codec-http-4.1.112.Final.jar,
- target/dependency/netty-codec-http2-4.1.112.Final.jar,
- target/dependency/netty-common-4.1.112.Final.jar,
- target/dependency/netty-handler-4.1.112.Final.jar,
  target/dependency/netty-nio-client-2.28.26.jar,
- target/dependency/netty-resolver-4.1.112.Final.jar,
- target/dependency/netty-transport-4.1.112.Final.jar,
- target/dependency/netty-transport-classes-epoll-4.1.112.Final.jar,
- target/dependency/netty-transport-native-unix-common-4.1.112.Final.jar,
  target/dependency/nimbus-jose-jwt-9.41.2.jar,
  target/dependency/profiles-2.28.26.jar,
  target/dependency/protocol-core-2.28.26.jar,
@@ -73,6 +59,5 @@ Bundle-Classpath: target/classes/,
  target/dependency/retries-2.28.26.jar,
  target/dependency/retries-spi-2.28.26.jar,
  target/dependency/sdk-core-2.28.26.jar,
- target/dependency/slf4j-api-1.7.36.jar,
  target/dependency/third-party-jackson-core-2.28.26.jar,
  target/dependency/utils-2.28.26.jar

plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/AmazonQLspClientImpl.java

@@ -151,7 +151,7 @@ public final CompletableFuture<ShowDocumentResult> showDocument(final ShowDocume
 
     @Override
     public final void ssoTokenChanged(final SsoTokenChangedParams params) {
-        SsoTokenChangedKind kind = SsoTokenChangedKind.valueOf(params.kind());
+        SsoTokenChangedKind kind = SsoTokenChangedKind.fromValue(params.kind());
         Activator.getLogger().info("Processing " + kind + "ssoTokenChanged notification...");
 
         try {

plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/auth/model/SsoTokenChangedKind.java

@@ -13,6 +13,15 @@ public enum SsoTokenChangedKind {
         this.value = value;
     }
 
+    public static SsoTokenChangedKind fromValue(final String value) {
+        for (SsoTokenChangedKind kind : values()) {
+            if (kind.getValue().equalsIgnoreCase(value)) {
+                return kind;
+            }
+        }
+        throw new IllegalArgumentException("No enum constant " + SsoTokenChangedKind.class.getSimpleName() + " with value " + value);
+    }
+
     public String getValue() {
         return this.value;
     }

plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/manager/DefaultLspManager.java

@@ -52,7 +52,7 @@ public static Builder builder() {
     }
 
     @Override
-    public LspInstallResult getLspInstallation() {
+    public synchronized LspInstallResult getLspInstallation() {
         if (installResult != null) {
             return installResult;
         }

plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/manager/LspConstants.java

@@ -12,7 +12,7 @@ private LspConstants() {
         // Prevent instantiation
     }
 
-    public static final String CW_MANIFEST_URL = "https://d3akiidp1wvqyg.cloudfront.net/codewhisperer/0/manifest.json";
+    public static final String CW_MANIFEST_URL = "https://aws-language-servers-gamma.us-east-1.amazonaws.com/codewhisperer/0/manifest.json";
     public static final int MANIFEST_MAJOR_VERSION = 0;
 
     public static final String CW_LSP_FILENAME = "aws-lsp-codewhisperer.js";

plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/manager/fetcher/RemoteLspFetcher.java

@@ -101,6 +101,7 @@ public LspFetchResult fetch(final PluginPlatform platform, final PluginArchitect
 
         // delete invalid local cache
         ArtifactUtils.deleteDirectory(downloadDirectory);
+        emitGetServer(Result.FAILED, serverVersion, LanguageServerLocation.CACHE, null, start);
 
         // if all lsp target contents are successfully downloaded from remote location,
         // return the download location
@@ -118,6 +119,7 @@ public LspFetchResult fetch(final PluginPlatform platform, final PluginArchitect
         Activator.getLogger().info(String.format(
                 "Unable to download Amazon Q language server version v%s. Attempting to fetch from fallback location",
                 serverVersion));
+        emitGetServer(Result.FAILED, serverVersion, LanguageServerLocation.REMOTE, null, start);
 
         // use the most compatible fallback cached lsp version
         var fallbackDir = getFallback(serverVersion, platform, architecture, destination);

plugin/src/software/aws/toolkits/eclipse/amazonq/preferences/AmazonQPreferencePage.java

@@ -130,9 +130,8 @@ protected void valueChanged(final boolean oldValue, final boolean newValue) {
         };
         addField(telemetryOptIn);
 
-        Link telemetryLink = createLink(
-                "See <a href=\"https://docs.aws.amazon.com/sdkref/latest/guide/overview.html\">here</a> for more detail.",
-                20, telemetryOptInComposite);
+        Link telemetryLink = createLink("See <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/opt-out-IDE.html#opt-out-IDE-telemetry\">"
+                + "here</a> for more detail.", 20, telemetryOptInComposite);
         telemetryLink.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(final SelectionEvent event) {

plugin/src/software/aws/toolkits/eclipse/amazonq/telemetry/LanguageServerTelemetryProvider.java

@@ -9,6 +9,7 @@
 import software.aws.toolkits.eclipse.amazonq.lsp.manager.fetcher.RecordLspSetupArgs;
 import software.aws.toolkits.eclipse.amazonq.plugin.Activator;
 import software.aws.toolkits.telemetry.LanguageserverTelemetry;
+import software.aws.toolkits.telemetry.TelemetryDefinitions.LanguageServerLocation;
 import software.aws.toolkits.telemetry.TelemetryDefinitions.LanguageServerSetupStage;
 import software.aws.toolkits.telemetry.TelemetryDefinitions.Result;
 
@@ -36,14 +37,14 @@ public static void emitSetupGetManifest(final Result result, final RecordLspSetu
 
     public static void emitSetupGetServer(final Result result, final RecordLspSetupArgs args) {
         emitSetupMetric(result, args, LanguageServerSetupStage.GET_SERVER);
-        if (result == Result.FAILED) {
+        if (result == Result.FAILED && args.getLocation() == LanguageServerLocation.UNKNOWN) {
             emitSetupAll(Result.FAILED, args);
         }
     }
 
     public static void emitSetupValidate(final Result result, final RecordLspSetupArgs args) {
         emitSetupMetric(result, args, LanguageServerSetupStage.VALIDATE);
-        if (result == Result.FAILED) {
+        if (result == Result.FAILED && args.getLocation() != LanguageServerLocation.OVERRIDE) {
             emitSetupAll(Result.FAILED, args);
         }
     }