Merge EventTracker project into develop #4134

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

hawflau merged 23 commits into aws:develop from Leo10Gama:develop

Aug 23, 2022

samcli/commands/build/build_context.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ @@
     from samcli.commands._utils.experimental import ExperimentalFlag, prompt_experimental
     from samcli.lib.providers.sam_api_provider import SamApiProvider
+    from samcli.lib.telemetry.event import EventTracker
     from samcli.lib.utils.packagetype import IMAGE
     from samcli.commands._utils.template import get_template_data
@@ Expand Down Expand Up / @@ -271,6 +272,9 @@ def run(self): @@
                     move_template(stack.location, output_template_path, modified_template)
+                for f in self.get_resources_to_build().functions:
+                    EventTracker.track_event("BuildFunctionRuntime", f.runtime)
                 click.secho("\nBuild Succeeded", fg="green")
                 # try to use relpath so the command is easier to understand, however,
@@ Expand Down @@

samcli/commands/sync/command.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ @@
     )
     from samcli.cli.cli_config_file import configuration_option, TomlProvider
     from samcli.commands._utils.click_mutex import ClickMutex
+    from samcli.lib.telemetry.event import EventTracker, track_long_event
     from samcli.commands.sync.sync_context import SyncContext
     from samcli.lib.utils.colors import Colored
     from samcli.lib.utils.version_checker import check_newer_version
@@ Expand Down Expand Up / @@ -132,6 +133,7 @@ @@
     @capabilities_option(default=DEFAULT_CAPABILITIES)  # pylint: disable=E1120
     @pass_context
     @track_command
+    @track_long_event("SyncUsed", "Start", "SyncUsed", "End")
     @image_repository_validation
     @track_template_warnings([CodeDeployWarning.__name__, CodeDeployConditionWarning.__name__])
     @check_newer_version
@@ Expand Down Expand Up / @@ -236,6 +238,7 @@ def do_cli( @@
         build_dir = DEFAULT_BUILD_DIR_WITH_AUTO_DEPENDENCY_LAYER if dependency_layer else DEFAULT_BUILD_DIR
         LOG.debug("Using build directory as %s", build_dir)
+        EventTracker.track_event("UsedFeature", "Accelerate")
         with BuildContext(
             resource_identifier=None,
@@ Expand Down @@

samcli/lib/build/workflow_config.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,95 +4,24 @@ @@
     import os
     import logging
-    from collections import namedtuple
     from typing import Dict, List, Optional, Tuple, Union, cast
-    LOG = logging.getLogger(__name__)
-    CONFIG = namedtuple(
-        "Capability",
-        ["language", "dependency_manager", "application_framework", "manifest_name", "executable_search_paths"],
-    )
-    PYTHON_PIP_CONFIG = CONFIG(
-        language="python",
-        dependency_manager="pip",
-        application_framework=None,
-        manifest_name="requirements.txt",
-        executable_search_paths=None,
-    )
-    NODEJS_NPM_CONFIG = CONFIG(
-        language="nodejs",
-        dependency_manager="npm",
-        application_framework=None,
-        manifest_name="package.json",
-        executable_search_paths=None,
-    )
-    RUBY_BUNDLER_CONFIG = CONFIG(
-        language="ruby",
-        dependency_manager="bundler",
-        application_framework=None,
-        manifest_name="Gemfile",
-        executable_search_paths=None,
-    )
-    JAVA_GRADLE_CONFIG = CONFIG(
-        language="java",
-        dependency_manager="gradle",
-        application_framework=None,
-        manifest_name="build.gradle",
-        executable_search_paths=None,
-    )
-    JAVA_KOTLIN_GRADLE_CONFIG = CONFIG(
-        language="java",
-        dependency_manager="gradle",
-        application_framework=None,
-        manifest_name="build.gradle.kts",
-        executable_search_paths=None,
+    from samcli.lib.build.workflows import (
+        CONFIG,
+        PYTHON_PIP_CONFIG,
+        NODEJS_NPM_CONFIG,
+        RUBY_BUNDLER_CONFIG,
+        JAVA_GRADLE_CONFIG,
+        JAVA_KOTLIN_GRADLE_CONFIG,
+        JAVA_MAVEN_CONFIG,
+        DOTNET_CLIPACKAGE_CONFIG,
+        GO_MOD_CONFIG,
+        PROVIDED_MAKE_CONFIG,
+        NODEJS_NPM_ESBUILD_CONFIG,
     )
+    from samcli.lib.telemetry.event import EventTracker
-    JAVA_MAVEN_CONFIG = CONFIG(
-        language="java",
-        dependency_manager="maven",
-        application_framework=None,
-        manifest_name="pom.xml",
-        executable_search_paths=None,
-    )
-    DOTNET_CLIPACKAGE_CONFIG = CONFIG(
-        language="dotnet",
-        dependency_manager="cli-package",
-        application_framework=None,
-        manifest_name=".csproj",
-        executable_search_paths=None,
-    )
-    GO_MOD_CONFIG = CONFIG(
-        language="go",
-        dependency_manager="modules",
-        application_framework=None,
-        manifest_name="go.mod",
-        executable_search_paths=None,
-    )
-    PROVIDED_MAKE_CONFIG = CONFIG(
-        language="provided",
-        dependency_manager=None,
-        application_framework=None,
-        manifest_name="Makefile",
-        executable_search_paths=None,
-    )
-    NODEJS_NPM_ESBUILD_CONFIG = CONFIG(
-        language="nodejs",
-        dependency_manager="npm-esbuild",
-        application_framework=None,
-        manifest_name="package.json",
-        executable_search_paths=None,
-    )
+    LOG = logging.getLogger(__name__)
     class UnsupportedRuntimeException(Exception):
@@ Expand Down Expand Up / @@ -278,6 +207,9 @@ def get_workflow_config( @@
             # Identify workflow configuration from the workflow selector.
             config = cast(WorkFlowSelector, selector).get_config(code_dir, project_dir)
+            EventTracker.track_event("BuildWorkflowUsed", f"{config.language}-{config.dependency_manager}")
             return config
         except ValueError as ex:
             raise UnsupportedRuntimeException(
@@ Expand Down @@

samcli/lib/build/workflows.py

-Original file line number
+Diff line change
@@ -0,0 +1,102 @@
+    """Module for storing information about existing workflows."""
+    from collections import namedtuple
+    from typing import List
+    CONFIG = namedtuple(
+        "Capability",
+        ["language", "dependency_manager", "application_framework", "manifest_name", "executable_search_paths"],
+    )
+    PYTHON_PIP_CONFIG = CONFIG(
+        language="python",
+        dependency_manager="pip",
+        application_framework=None,
+        manifest_name="requirements.txt",
+        executable_search_paths=None,
+    )
+    NODEJS_NPM_CONFIG = CONFIG(
+        language="nodejs",
+        dependency_manager="npm",
+        application_framework=None,
+        manifest_name="package.json",
+        executable_search_paths=None,
+    )
+    RUBY_BUNDLER_CONFIG = CONFIG(
+        language="ruby",
+        dependency_manager="bundler",
+        application_framework=None,
+        manifest_name="Gemfile",
+        executable_search_paths=None,
+    )
+    JAVA_GRADLE_CONFIG = CONFIG(
+        language="java",
+        dependency_manager="gradle",
+        application_framework=None,
+        manifest_name="build.gradle",
+        executable_search_paths=None,
+    )
+    JAVA_KOTLIN_GRADLE_CONFIG = CONFIG(
+        language="java",
+        dependency_manager="gradle",
+        application_framework=None,
+        manifest_name="build.gradle.kts",
+        executable_search_paths=None,
+    )
+    JAVA_MAVEN_CONFIG = CONFIG(
+        language="java",
+        dependency_manager="maven",
+        application_framework=None,
+        manifest_name="pom.xml",
+        executable_search_paths=None,
+    )
+    DOTNET_CLIPACKAGE_CONFIG = CONFIG(
+        language="dotnet",
+        dependency_manager="cli-package",
+        application_framework=None,
+        manifest_name=".csproj",
+        executable_search_paths=None,
+    )
+    GO_MOD_CONFIG = CONFIG(
+        language="go",
+        dependency_manager="modules",
+        application_framework=None,
+        manifest_name="go.mod",
+        executable_search_paths=None,
+    )
+    PROVIDED_MAKE_CONFIG = CONFIG(
+        language="provided",
+        dependency_manager=None,
+        application_framework=None,
+        manifest_name="Makefile",
+        executable_search_paths=None,
+    )
+    NODEJS_NPM_ESBUILD_CONFIG = CONFIG(
+        language="nodejs",
+        dependency_manager="npm-esbuild",
+        application_framework=None,
+        manifest_name="package.json",
+        executable_search_paths=None,
+    )
+    ALL_CONFIGS: List[CONFIG] = [
+        PYTHON_PIP_CONFIG,
+        NODEJS_NPM_CONFIG,
+        RUBY_BUNDLER_CONFIG,
+        JAVA_GRADLE_CONFIG,
+        JAVA_KOTLIN_GRADLE_CONFIG,
+        JAVA_MAVEN_CONFIG,
+        DOTNET_CLIPACKAGE_CONFIG,
+        GO_MOD_CONFIG,
+        PROVIDED_MAKE_CONFIG,
+        NODEJS_NPM_ESBUILD_CONFIG,
+    ]

samcli/lib/sync/sync_flow_executor.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     from concurrent.futures import ThreadPoolExecutor, Future
     from botocore.exceptions import ClientError
+    from samcli.lib.telemetry.event import EventName, EventTracker, EventType
     from samcli.lib.utils.colors import Colored
     from samcli.lib.providers.exceptions import MissingLocalDefinition
@@ Expand Down Expand Up @@
             SyncFlowException
             """
             dependent_sync_flows = []
+            sync_types = EventType.get_accepted_values(EventName.SYNC_FLOW_START)
+            sync_type: Optional[str] = type(sync_flow).__name__
+            if sync_type not in sync_types:
+                sync_type = None
             try:
+                if sync_type:
+                    EventTracker.track_event("SyncFlowStart", sync_type)
                 dependent_sync_flows = sync_flow.execute()
             except ClientError as e:
                 if e.response.get("Error", dict()).get("Code", "") == "ResourceNotFoundException":
                     raise SyncFlowException(sync_flow, MissingPhysicalResourceError()) from e
                 raise SyncFlowException(sync_flow, e) from e
             except Exception as e:
                 raise SyncFlowException(sync_flow, e) from e
+            finally:
+                if sync_type:
+                    EventTracker.track_event("SyncFlowEnd", sync_type)
             return SyncFlowResult(sync_flow=sync_flow, dependent_sync_flows=dependent_sync_flows)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge EventTracker project into develop #4134

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!