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

Release Version 3.0.0 #1309

Merged
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/backcompat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Back Compatibility CI

on:
push:
branches: [ develop ]
branches: [ 2.x ]
pull_request:
branches: [ develop ]
branches: [ 2.x ]

jobs:
backcompat:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Integration Tests CI

on:
push:
branches: [ develop, beta ]
branches: [ main ]
pull_request:
branches: [ develop, beta ]
branches: [ main ]

jobs:
integration:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Node.js CI

on:
push:
branches: [ develop, beta ]
branches: [ main ]
pull_request:
branches: [ develop, beta ]
branches: [ main ]

jobs:
build:
Expand Down
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio

# How to contribute to the Application Insights Node.js SDK


1. Fork this repo
2. Clone your fork locally (`git clone /~https://github.com/<youruser>/ApplicationInsights-node.js
3. Open a terminal and move into your local copy (`cd ApplicationInsights-node.js`)
2. Clone your fork locally `git clone /~https://github.com/<youruser>/ApplicationInsights-node.js`.
3. Open a terminal and move into your local copy `cd ApplicationInsights-node.js`.
4. Install all dependencies with `npm install`.
5. Build project
```bash
Expand Down
410 changes: 275 additions & 135 deletions README.md

Large diffs are not rendered by default.

1,030 changes: 751 additions & 279 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
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-beta.12",
"version": "3.0.0",
"description": "Microsoft Application Insights module for Node.js",
"repository": {
"type": "git",
Expand Down Expand Up @@ -68,8 +68,8 @@
"@azure/core-client": "^1.0.0",
"@azure/core-rest-pipeline": "^1.9.2",
"@azure/identity": "^3.1.3",
"@azure/monitor-opentelemetry": "^1.3.0",
"@azure/monitor-opentelemetry-exporter": "^1.0.0-beta.21",
"@azure/monitor-opentelemetry": "^1.4.0",
"@azure/monitor-opentelemetry-exporter": "^1.0.0-beta.22",
"@azure/opentelemetry-instrumentation-azure-sdk": "^1.0.0-beta.5",
"@opentelemetry/api": "^1.8.0",
"@opentelemetry/api-logs": "^0.49.1",
Expand Down
11 changes: 6 additions & 5 deletions src/shared/configuration/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ export class ApplicationInsightsConfig {
this.otlpTraceExporterConfig = {};
this.enableAutoCollectPerformance = true;
this.enableAutoCollectExceptions = true;
this.enableAutoCollectPerformance = true;

this.azureMonitorExporterOptions = {};
this.samplingRatio = 1;
Expand All @@ -80,10 +79,12 @@ export class ApplicationInsightsConfig {
// Check for explicitly passed options when instantiating client
// This will take precedence over other settings
if (options) {
this.enableAutoCollectExceptions =
options.enableAutoCollectExceptions || this.enableAutoCollectExceptions;
this.enableAutoCollectPerformance =
options.enableAutoCollectPerformance || this.enableAutoCollectPerformance;
if (typeof(options.enableAutoCollectExceptions) === "boolean") {
this.enableAutoCollectExceptions = options.enableAutoCollectExceptions;
}
if (typeof(options.enableAutoCollectPerformance) === "boolean") {
this.enableAutoCollectPerformance = options.enableAutoCollectPerformance;
}
this.otlpTraceExporterConfig = Object.assign(
this.otlpTraceExporterConfig,
options.otlpTraceExporterConfig
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { InstrumentationConfig } from "@opentelemetry/instrumentation";
import { OTLPExporterNodeConfigBase } from "@opentelemetry/otlp-exporter-base";


export const AZURE_MONITOR_OPENTELEMETRY_VERSION = "1.0.0-beta.12";
export const AZURE_MONITOR_OPENTELEMETRY_VERSION = "1.3.0";
export const DEFAULT_ROLE_NAME = "Web";
process.env["AZURE_MONITOR_DISTRO_VERSION"] = AZURE_MONITOR_OPENTELEMETRY_VERSION;

Expand Down
2 changes: 1 addition & 1 deletion test/backCompatibility/oldTSC/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 test/performanceTests/package.json
Original file line number Diff line number Diff line change
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-beta.12",
"applicationinsights": "^3.0.0",
"dotenv": "^16.4.5",
"tslib": "^2.6.2"
},
Expand Down
Loading