Add Cli Telemetry

Author: adwsingh

mcp/mcp-cli-api/build.gradle.kts

@@ -23,14 +23,6 @@ tasks.compileJava {
     options.compilerArgs.add("-Aproject=mcp-cli-api")
 }
 
-sourceSets {
-    main {
-        java {
-            srcDir("model")
-        }
-    }
-}
-
 afterEvaluate {
     val typePath = smithy.getPluginProjectionPath(smithy.sourceProjection.get(), "java-type-codegen")
     sourceSets {
@@ -51,10 +43,6 @@ tasks.named("compileJava") {
     dependsOn("smithyBuild")
 }
 
-tasks.withType<JavaCompile> {
-    options.release.set(21)
-}
-
 // Needed because sources-jar needs to run after smithy-build is done
 tasks.sourcesJar {
     mustRunAfter(tasks.compileJava)

mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/CliMetrics.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.java.mcp.cli;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import software.amazon.smithy.java.mcp.cli.model.TelemetryData;
+
+public final class CliMetrics implements AutoCloseable {
+
+    private final TelemetryPublisher telemetryPublisher;
+    private final TelemetryData.Builder telemetryData;
+    private final Map<String, Long> counters = new ConcurrentHashMap<>();
+    private final Map<String, Long> timings = new ConcurrentHashMap<>();
+    private final long startTime;
+
+    CliMetrics(final TelemetryPublisher telemetryPublisher, TelemetryData.Builder telemetryData) {
+        this.telemetryPublisher = telemetryPublisher;
+        this.telemetryData = telemetryData;
+        this.startTime = System.nanoTime();
+    }
+
+    public void addCount(String name, long count) {
+        counters.put(name, count);
+    }
+
+    public void addTiming(String name, long time) {
+        timings.put(name, time);
+    }
+
+    @Override
+    public void close() {
+        timings.put("Time", System.nanoTime() - startTime);
+        telemetryData
+                .counters(counters)
+                .timings(timings)
+                .build();
+        telemetryPublisher.publish(telemetryData.build());
+    }
+}

mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/ConfigUtils.java

@@ -303,14 +303,15 @@ public static McpBundleConfig addMcpBundle(Config config, String id, Bundle bund
                 .fileLocation(ConfigUtils.getBundleFileLocation(id).toString())
                 .build();
         var builder = McpBundleConfig.builder();
-        switch (bundle.getValue()) {
-            case SmithyMcpBundle smithyBundle -> builder.smithyModeled(SmithyModeledBundleConfig.builder()
+        switch (bundle.type()) {
+            case smithyBundle -> builder.smithyModeled(SmithyModeledBundleConfig.builder()
                     .name(id)
-                    .metadata(smithyBundle.getMetadata())
+                    .metadata(((SmithyMcpBundle) (bundle.getValue())).getMetadata())
                     .bundleLocation(location)
                     .local(isLocal)
                     .build());
-            case GenericBundle genericBundle -> {
+            case genericBundle -> {
+                GenericBundle genericBundle = bundle.getValue();
                 install(genericBundle.getInstall());
                 builder.genericConfig(
                         GenericToolBundleConfig.builder()

mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/ExecutionContext.java

@@ -8,4 +8,4 @@
 import software.amazon.smithy.java.mcp.cli.model.Config;
 import software.amazon.smithy.mcp.bundle.api.Registry;
 
-public record ExecutionContext(Config config, Registry registry) {}
+public record ExecutionContext(Config config, Registry registry, CliMetrics metrics) {}

mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/SmithyMcpCommand.java

@@ -5,11 +5,19 @@
 
 package software.amazon.smithy.java.mcp.cli;
 
+import static picocli.CommandLine.*;
 import static software.amazon.smithy.java.mcp.cli.ConfigUtils.loadOrCreateConfig;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ServiceLoader;
 import java.util.concurrent.Callable;
+import picocli.CommandLine;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Spec;
 import software.amazon.smithy.java.logging.InternalLogger;
 import software.amazon.smithy.java.mcp.cli.model.Config;
+import software.amazon.smithy.java.mcp.cli.model.TelemetryData;
 
 /**
  * Base class for all Smithy MCP CLI commands.
@@ -18,15 +26,26 @@
  * for all MCP CLI commands. It handles loading the configuration, executing the command,
  * and providing appropriate error handling.
  */
+@Command(name = "dummy")
 public abstract class SmithyMcpCommand implements Callable<Integer> {
 
     InternalLogger LOG = InternalLogger.getLogger(SmithyMcpCommand.class);
 
+    private static final TelemetryPublisher TELEMETRY_PUBLISHER = findTelemetryPublisher();
+
+    @Spec
+    CommandSpec spec;
+
     @Override
     public final Integer call() {
-        try {
+        TelemetryData.Builder telemetry = TelemetryData.builder();
+        String commandName = getCommandName(spec.commandLine());
+        telemetry.command(commandName)
+                .cliVersion(spec.version()[0]);
+
+        try (var metrics = new CliMetrics(TELEMETRY_PUBLISHER, telemetry)) {
             var config = loadOrCreateConfig();
-            execute(new ExecutionContext(config, RegistryUtils.getRegistry(registryToUse(config), config)));
+            execute(new ExecutionContext(config, RegistryUtils.getRegistry(registryToUse(config), config), metrics));
             return 0;
         } catch (IllegalArgumentException e) {
             System.out.println("Invalid input : [" + e.getMessage() + "]");
@@ -37,6 +56,22 @@ public final Integer call() {
         }
     }
 
+    private static String getCommandName(CommandLine commandLine) {
+        List<String> commands = new ArrayList<>();
+        while (commandLine != null) {
+            commands.add(commandLine.getCommandName());
+            commandLine = commandLine.getParent();
+        }
+
+        StringBuilder commandName = new StringBuilder();
+        for (int i = commands.size() - 2; i >= 0; i--) {
+            commandName.append(commands.get(i));
+            if (i > 0)
+                commandName.append(":");
+        }
+        return commandName.toString();
+    }
+
     /**
      * Execute the command with the provided configuration.
      * <p>
@@ -50,4 +85,11 @@ public final Integer call() {
     protected String registryToUse(Config config) {
         return config.getDefaultRegistry();
     }
+
+    private static TelemetryPublisher findTelemetryPublisher() {
+        return ServiceLoader.load(TelemetryPublisherProvider.class)
+                .findFirst()
+                .map(TelemetryPublisherProvider::get)
+                .orElse(d -> {});
+    }
 }

mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/TelemetryPublisher.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.java.mcp.cli;
+
+import software.amazon.smithy.java.mcp.cli.model.TelemetryData;
+
+public interface TelemetryPublisher {
+
+    void publish(TelemetryData data);
+
+}

mcp/mcp-cli-api/src/main/java/software/amazon/smithy/java/mcp/cli/TelemetryPublisherProvider.java

@@ -0,0 +1,12 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package software.amazon.smithy.java.mcp.cli;
+
+public interface TelemetryPublisherProvider {
+
+    TelemetryPublisher get();
+
+}

mcp/mcp-cli-api/src/main/resources/META-INF/smithy/manifest

@@ -0,0 +1 @@
+mcp-cli-api.smithy

mcp/mcp-cli-api/model/main.smithy renamed to mcp/mcp-cli-api/src/main/resources/META-INF/smithy/mcp-cli-api.smithy

@@ -25,6 +25,28 @@ union McpBundleConfig {
     genericConfig: GenericToolBundleConfig
 }
 
+structure TelemetryData {
+    @required
+    command: String
+
+    @required
+    cliVersion: String
+
+    @required
+    @default({})
+    counters: Counters
+
+    @required
+    @default({})
+    properties: Properties
+
+    @required
+    @default({})
+    timings: Timings
+
+    params: String
+}
+
 @mixin
 structure CommonToolConfig {
     name: String
@@ -119,3 +141,18 @@ map EnvVars {
     key: String
     value: String
 }
+
+map Counters {
+    key: String
+    value: PrimitiveLong
+}
+
+map Timings {
+    key: String
+    value: PrimitiveLong
+}
+
+map Properties {
+    key: String
+    value: String
+}