Skip to content

Commit fa4bba4

Browse files
committed
Add missing properties for spring cloud service
1 parent 79872fc commit fa4bba4

File tree

4 files changed

+27
-5
lines changed

4 files changed

+27
-5
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/springcloud/deplolyment/SpringCloudDeploymentConfigurationState.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ protected void updateTelemetryMap(@NotNull Map<String, String> telemetryMap) {
139139
final Map<String, String> props = new HashMap<>();
140140
props.put("runtime", config.getAppConfig().getRuntimeVersion());
141141
props.put("subscriptionId", config.getAppConfig().getSubscriptionId());
142+
props.put("public", String.valueOf(config.getAppConfig().isPublic()));
143+
props.put("jvmOptions", String.valueOf(StringUtils.isEmpty(config.getAppConfig().getDeployment().getJvmOptions())));
144+
props.put("instanceCount", String.valueOf(config.getAppConfig().getDeployment().getInstanceCount()));
145+
props.put("memory", String.valueOf(config.getAppConfig().getDeployment().getMemoryInGB()));
146+
props.put("cpu", String.valueOf(config.getAppConfig().getDeployment().getCpu()));
142147
telemetryMap.putAll(props);
143148
}
144149

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/springcloud/properties/SpringCloudAppPropertiesEditor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.intellij.ui.HyperlinkLabel;
2323
import com.intellij.ui.PopupMenuListenerAdapter;
2424
import com.intellij.ui.table.JBTable;
25+
import com.microsoft.azure.common.Utils;
2526
import com.microsoft.azure.common.exceptions.AzureExecutionException;
2627
import com.microsoft.azure.management.appplatform.v2020_07_01.AppResourceProperties;
2728
import com.microsoft.azure.management.appplatform.v2020_07_01.DeploymentResourceProperties;
@@ -358,6 +359,7 @@ private void wrapperOperations(String operation, String actionName, Project proj
358359
final String message = String.format("%s app (%s)", actionName, this.appName);
359360
AzureTaskManager.getInstance().runInBackground(new AzureTask(null, message, false, () -> {
360361
EventUtil.executeWithLog(TelemetryConstants.SPRING_CLOUD, operation, logOperation -> {
362+
logOperation.trackProperty(TelemetryConstants.SUBSCRIPTIONID, Utils.getSubscriptionId(clusterId));
361363
action.accept(changes);
362364
});
363365
refreshData();

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/springcloud/streaminglog/SpringCloudStreamingLogAction.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,16 @@ private void showLogStreamingDialog(List<DeploymentInstance> instances) {
9999
});
100100
}
101101

102+
@Override
103+
protected String getServiceName(final NodeActionEvent event) {
104+
return SPRING_CLOUD;
105+
}
106+
107+
@Override
108+
protected String getOperationName(final NodeActionEvent event) {
109+
return START_STREAMING_LOG_SPRING_CLOUD_APP;
110+
}
111+
102112
@Override
103113
public int getGroup() {
104114
return Groupable.DIAGNOSTIC_GROUP;

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/springcloud/SpringCloudAppNode.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@
99
import com.microsoft.azure.management.appplatform.v2020_07_01.implementation.AppResourceInner;
1010
import com.microsoft.azure.management.appplatform.v2020_07_01.implementation.DeploymentResourceInner;
1111
import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
12-
import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
13-
import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
1412
import com.microsoft.azuretools.ActionConstants;
1513
import com.microsoft.azuretools.azurecommons.helpers.Nullable;
1614
import com.microsoft.azuretools.core.mvp.model.springcloud.AzureSpringCloudMvpModel;
1715
import com.microsoft.azuretools.core.mvp.model.springcloud.SpringCloudIdHelper;
16+
import com.microsoft.azuretools.telemetry.TelemetryConstants;
17+
import com.microsoft.azuretools.telemetry.TelemetryProperties;
1818
import com.microsoft.tooling.msservices.components.DefaultLoader;
1919
import com.microsoft.tooling.msservices.serviceexplorer.AzureActionEnum;
2020
import com.microsoft.tooling.msservices.serviceexplorer.AzureIconSymbol;
2121
import com.microsoft.tooling.msservices.serviceexplorer.BasicActionBuilder;
2222
import com.microsoft.tooling.msservices.serviceexplorer.Node;
2323
import com.microsoft.tooling.msservices.serviceexplorer.NodeAction;
24-
import com.microsoft.tooling.msservices.serviceexplorer.NodeActionEvent;
25-
import com.microsoft.tooling.msservices.serviceexplorer.NodeActionListener;
2624
import io.reactivex.rxjava3.disposables.Disposable;
2725
import org.apache.commons.lang3.StringUtils;
2826

@@ -31,7 +29,7 @@
3129
import java.util.Map;
3230
import java.util.Objects;
3331

34-
public class SpringCloudAppNode extends Node implements SpringCloudAppNodeView {
32+
public class SpringCloudAppNode extends Node implements SpringCloudAppNodeView, TelemetryProperties {
3533

3634
private static final String ACTION_OPEN_IN_BROWSER = "Open In Browser";
3735
private static final Map<DeploymentResourceStatus, AzureIconSymbol> STATUS_TO_ICON_MAP = new HashMap<>();
@@ -110,6 +108,13 @@ public String getSubscriptionId() {
110108
return subscriptionId;
111109
}
112110

111+
@Override
112+
public Map<String, String> toProperties() {
113+
final Map<String, String> properties = new HashMap<>();
114+
properties.put(TelemetryConstants.SUBSCRIPTIONID, this.subscriptionId);
115+
return properties;
116+
}
117+
113118
@Override
114119
protected void loadActions() {
115120
addAction(initActionBuilder(this::start).withAction(AzureActionEnum.START).withBackgroudable(true).build());

0 commit comments

Comments
 (0)