Skip to content
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

3.0.1 Release #1313

Merged
merged 7 commits into from Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -3,7 +3,7 @@
"author": "Microsoft Application Insights Team",
"license": "MIT",
"bugs": "https://github.com/microsoft/ApplicationInsights-node.js/issues",
"version": "3.0.0",
"version": "3.0.1",
"description": "Microsoft Application Insights module for Node.js",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions src/agent/diagnostics/baseDiagnosticLogger.ts
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT license.

import { IAgentLogger, IDiagnosticLog, IDiagnosticLogger, LOGGER_LANGUAGE, LOGGER_NAME } from "../types";
import { AZURE_MONITOR_OPENTELEMETRY_VERSION } from "../../types";
import { APPLICATION_INSIGHTS_OPENTELEMETRY_VERSION } from "../../types";


export class BaseDiagnosticLogger implements IDiagnosticLogger {
Expand All @@ -22,11 +22,11 @@
this._language = LOGGER_LANGUAGE;
this._siteName = process.env.WEBSITE_SITE_NAME;
this._extensionVersion = process.env.ApplicationInsightsAgent_EXTENSION_VERSION;
this._sdkVersion = AZURE_MONITOR_OPENTELEMETRY_VERSION;
this._sdkVersion = APPLICATION_INSIGHTS_OPENTELEMETRY_VERSION;
this._subscriptionId = process.env.WEBSITE_OWNER_NAME ? process.env.WEBSITE_OWNER_NAME.split("+")[0] : null;
}

public logMessage(diagnosticLog: IDiagnosticLog) {

Check warning on line 29 in src/agent/diagnostics/baseDiagnosticLogger.ts

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, 16.x)

'diagnosticLog' is defined but never used

Check warning on line 29 in src/agent/diagnostics/baseDiagnosticLogger.ts

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, 18.x)

'diagnosticLog' is defined but never used
// No OP
}
}
4 changes: 2 additions & 2 deletions src/agent/diagnostics/statusLogger.ts
Expand Up @@ -4,7 +4,7 @@
import * as os from "os";
import { FileWriter } from "./writers/fileWriter";
import { IAgentLogger, IStatusContract, LOGGER_LANGUAGE } from "../types";
import { AZURE_MONITOR_OPENTELEMETRY_VERSION } from "../../types";
import { APPLICATION_INSIGHTS_OPENTELEMETRY_VERSION } from "../../types";


export class StatusLogger {
Expand All @@ -19,7 +19,7 @@ export class StatusLogger {
this._agentLogger = agentLogger;
this._instrumentationKey = instrumentationKey;
this._language = LOGGER_LANGUAGE;
this._sdkVersion = AZURE_MONITOR_OPENTELEMETRY_VERSION;
this._sdkVersion = APPLICATION_INSIGHTS_OPENTELEMETRY_VERSION;
this._machineName = os.hostname();
this._processId = String(process.pid);
}
Expand Down
4 changes: 2 additions & 2 deletions src/agent/diagnostics/writers/azureFunctionsWriter.ts
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { AZURE_MONITOR_OPENTELEMETRY_VERSION } from "../../../types";
import { APPLICATION_INSIGHTS_OPENTELEMETRY_VERSION } from "../../../types";
import { AZURE_APP_NAME, IAgentLogger } from "../../types";

const AZURE_FUNCTIONS_DIAGNOSTIC_PREFIX = "LanguageWorkerConsoleLogMS_APPLICATION_INSIGHTS_LOGS";
Expand All @@ -14,7 +14,7 @@ export class AzureFunctionsWriter implements IAgentLogger {
constructor(instrumentationKey: string) {
this._instrumentationKey = instrumentationKey;
this._appName = AZURE_APP_NAME;
this._agentVersion = AZURE_MONITOR_OPENTELEMETRY_VERSION;
this._agentVersion = APPLICATION_INSIGHTS_OPENTELEMETRY_VERSION;
}

public log(log: any) {
Expand Down
3 changes: 1 addition & 2 deletions src/types.ts
Expand Up @@ -7,9 +7,8 @@ import { InstrumentationConfig } from "@opentelemetry/instrumentation";
import { OTLPExporterNodeConfigBase } from "@opentelemetry/otlp-exporter-base";


export const AZURE_MONITOR_OPENTELEMETRY_VERSION = "1.3.0";
export const APPLICATION_INSIGHTS_OPENTELEMETRY_VERSION = "3.0.1";
export const DEFAULT_ROLE_NAME = "Web";
process.env["AZURE_MONITOR_DISTRO_VERSION"] = AZURE_MONITOR_OPENTELEMETRY_VERSION;

/**
* Azure Monitor OpenTelemetry Options
Expand Down
2 changes: 1 addition & 1 deletion test/performanceTests/package.json
Expand Up @@ -13,7 +13,7 @@
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/api-logs": "^0.49.1",
"@opentelemetry/sdk-logs": "^0.49.1",
"applicationinsights": "^3.0.0",
"applicationinsights": "^3.0.1",
"dotenv": "^16.4.5",
"tslib": "^2.6.2"
},
Expand Down