Skip to content

Commit 874cc20

Browse files
ramanujbhattacharjee93rambhatt-msfttokaplan
authored
Bump Java SDK Version to the latest (#1369)
* add change for Java SDK * Build tweaks * Install node * Build tweak * Build fix attempt * Build fix attempt * Vulnerability - temporarily ignoring --------- Co-authored-by: Ramanuj Bhattacharjee <rambhatt@microsoft.com> Co-authored-by: alkaplan <alkaplan@microsoft.com>
1 parent 7df9b44 commit 874cc20

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

.pipelines/azure_pipeline_mergedbranches_appmonitoring.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ jobs:
124124
ls -a
125125
126126
echo "Installing npm packages..."
127-
sudo npm install
127+
npm i
128+
npm ci
128129
129130
#echo "Updating packages..."
130131
#npm update

.pipelines/azure_pipeline_validation_appmonitoring.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ jobs:
9393
ls -a
9494
9595
echo "Installing npm packages..."
96-
sudo npm install
96+
npm i
97+
npm ci
9798
9899
#echo "Updating packages..."
99100
#npm update
@@ -130,6 +131,11 @@ jobs:
130131
fi
131132
132133
echo "Jest is done"
134+
135+
echo "Pruning packages..."
136+
sudo npx modclean -r
137+
sudo npm prune --production
138+
echo "Pruning packages is done"
133139
134140
pwd
135141
ls -a

appmonitoring/ts/src/LoggerWrapper.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ class LocalLogger {
237237
}
238238

239239
for(const metricName in this.heartbeatAccumulator.metrics) {
240-
const telemetryItem: MetricTelemetry = {
240+
const telemetryItem = {
241241
name: HeartbeatMetrics[metricName],
242242
value: Number(this.heartbeatAccumulator.metrics[metricName]),
243243
count: 1,
@@ -270,7 +270,7 @@ class LocalLogger {
270270
break;
271271
}
272272

273-
const telemetryItem: TraceTelemetry = {
273+
const telemetryItem = {
274274
message: logArray[j].message,
275275
time: new Date(),
276276
properties: {
@@ -288,14 +288,15 @@ class LocalLogger {
288288

289289
public SendEvent(eventName: string, operationId: string, uid: string, clusterArmId: string, clusterArmRegion: string, flush = false, ...args: unknown[]) {
290290
try {
291-
const event: EventTelemetry = {
291+
const event = {
292292
name: eventName,
293293
properties: {
294294
time: Date.now(),
295295
extra: JSON.stringify(args),
296296
operationId: operationId,
297297
clusterArmId: clusterArmId,
298298
clusterArmRegion: clusterArmRegion,
299+
clusterMetadata: this.clusterMetadata,
299300
uid: uid
300301
},
301302
};

appmonitoring/ts/src/Mutations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export class Mutations {
1616
};
1717
private static agentImageJava = {
1818
repositoryPath: "auto-instrumentation/java",
19-
imageTag: "3.5.2-aks"
19+
imageTag: "3.7.1-aks"
2020
};
2121

2222
// path on agent image to copy from

appmonitoring/ts/src/tests/LoggerWrapper.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ describe("Heartbeats", () => {
3737
logger.appendHeartbeatLog(HeartbeatLogs.CertificateOperations, "blah-blah-blah-75");
3838
}
3939

40-
const tracesSent = <TraceTelemetry[]>[];
40+
const tracesSent = [];
4141

42-
jest.spyOn(TelemetryClient.prototype, "trackTrace").mockImplementation((telemetry: TraceTelemetry) => {
42+
jest.spyOn(TelemetryClient.prototype, "trackTrace").mockImplementation((telemetry) => {
4343
tracesSent.push(telemetry);
4444
});
4545

@@ -60,9 +60,9 @@ describe("Heartbeats", () => {
6060
logger.addHeartbeatMetric(HeartbeatMetrics.InstrumentedNamespaceCount, 2);
6161
logger.setHeartbeatMetric(HeartbeatMetrics.InstrumentedNamespaceCount, 1);
6262

63-
const metricsSent = <MetricTelemetry[]>[];
63+
const metricsSent = [];
6464

65-
jest.spyOn(TelemetryClient.prototype, "trackMetric").mockImplementation((telemetry: MetricTelemetry) => {
65+
jest.spyOn(TelemetryClient.prototype, "trackMetric").mockImplementation((telemetry) => {
6666
metricsSent.push(telemetry);
6767
});
6868

0 commit comments

Comments
 (0)