Skip to content

Commit dbff6f9

Browse files
committed
Change startup metric to a log, update public suffix, and fix a bug with multiple parameters in equals
1 parent c9c8760 commit dbff6f9

5 files changed

Lines changed: 3304 additions & 2293 deletions

File tree

‎src/main/java/com/laytonsmith/core/functions/BasicLogic.java‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,17 @@ public CBoolean exec(Target t, Environment env, Mixed... args) throws CancelComm
109109
}
110110
return CBoolean.get(equals);
111111
}
112-
if(ArgumentValidation.anyBooleans(args)) {
113-
boolean equals = true;
114-
for(int i = 1; i < args.length; i++) {
115-
boolean arg1 = ArgumentValidation.getBoolean(args[i - 1], t);
116-
boolean arg2 = ArgumentValidation.getBoolean(args[i], t);
117-
if(arg1 != arg2) {
118-
equals = false;
119-
break;
120-
}
121-
}
122-
return CBoolean.get(equals);
123-
}
124-
125112
{
126113
boolean equals = true;
127114
for(int i = 1; i < args.length; i++) {
128-
if(!args[i - 1].val().equals(args[i].val())) {
115+
if(args[i - 1] instanceof CBoolean || args[i] instanceof CBoolean) {
116+
boolean arg1 = ArgumentValidation.getBoolean(args[i - 1], t);
117+
boolean arg2 = ArgumentValidation.getBoolean(args[i], t);
118+
if(arg1 != arg2) {
119+
equals = false;
120+
break;
121+
}
122+
} else if(!args[i - 1].val().equals(args[i].val())) {
129123
equals = false;
130124
break;
131125
}

‎src/main/java/com/laytonsmith/core/telemetry/DefaultTelemetry.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public class DefaultTelemetry {
88

99
@TelemetryCategory(name = "methodscript.startup",
1010
group = TelemetryCategoryGroup.GENERAL_GROUP,
11-
type = TelemetryType.METRIC,
11+
type = TelemetryType.LOG,
1212
purpose = "This category logs startup of the program.")
13-
public static class StartupMetric implements MetricTelemetryValue {}
13+
public static class StartupMetric implements LogTelemetryValue {}
1414

1515
@TelemetryCategory(name = "methodscript.startupMode",
1616
group = TelemetryCategoryGroup.GENERAL_GROUP,

‎src/main/java/com/laytonsmith/core/telemetry/Telemetry.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
import com.laytonsmith.core.telemetry.ApplicationInsights.Envelope;
44
import com.laytonsmith.PureUtilities.Common.StreamUtils;
55
import com.laytonsmith.PureUtilities.JSONUtil;
6+
import com.laytonsmith.PureUtilities.MapBuilder;
67
import com.laytonsmith.abstraction.Implementation;
78
import com.laytonsmith.core.MethodScriptFileLocations;
89
import com.laytonsmith.core.Prefs;
10+
import com.laytonsmith.core.compiler.analysis.StaticAnalysisConfiguration;
911
import com.laytonsmith.core.telemetry.ApplicationInsights.TelemetryUtil;
1012
import java.io.File;
13+
import java.io.IOException;
1114
import java.util.HashMap;
1215
import java.util.Map;
1316
import java.util.Objects;
@@ -127,7 +130,16 @@ public void initializeTelemetry() {
127130
}
128131
}
129132

130-
metric(DefaultTelemetry.StartupMetric.class);
133+
boolean saEnabled = false;
134+
try {
135+
saEnabled = StaticAnalysisConfiguration.GetConfiguration().globalEnable();
136+
} catch(IOException ex) {
137+
// Ignore, default to false
138+
}
139+
140+
log(DefaultTelemetry.StartupMetric.class,
141+
MapBuilder.start("saEnabled", Boolean.toString(saEnabled)),
142+
null);
131143
}
132144

133145
/**

0 commit comments

Comments
 (0)