Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: microsoft/ApplicationInsights-node.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.1.3
Choose a base ref
...
head repository: microsoft/ApplicationInsights-node.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.1.4
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Jul 12, 2021

  1. Updating to latest Azure SDK and OpenTelemetry dependencies (#790) 

    * Updating to latest Azure SDK and OpenTelemetry dependencies

* diagnostic-channel-publishers need to be updated as well, will update package.lock.json once is published

* Trigger build

* lock
    @hectorhdzg
    hectorhdzg authored Jul 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6f496c6 View commit details

  2. 2.1.4 release (#791)

    @hectorhdzg
    hectorhdzg authored Jul 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5ce8855 View commit details
7 changes: 3 additions & 4 deletions AutoCollection/AsyncHooksScopeManager.ts
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ export class OpenTelemetryScopeManagerWrapper {
if (key === this._activeSymbol) {
return context;
}

return false;
},
setValue: () => { }
@@ -55,10 +54,10 @@ export class OpenTelemetryScopeManagerWrapper {
}

private static _spanToContext(span: Span, parentSpanId?: string, name?: string): CorrelationContext {
const _parentId = parentSpanId ? `|${span.context().traceId}.${parentSpanId}.` : span.context().traceId;
const _parentId = parentSpanId ? `|${span.spanContext().traceId}.${parentSpanId}.` : span.spanContext().traceId;
const context: SpanContext = {
...span.context(),
traceFlags: span.context().traceFlags
...span.spanContext(),
traceFlags: span.spanContext().traceFlags
};
const correlationContext = CorrelationContextManager.spanToContextObject(context, _parentId, name)
return correlationContext;
2 changes: 1 addition & 1 deletion AutoCollection/diagnostic-channel/SpanParser.ts
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ function filterSpanAttributes(attributes: SpanAttributes) {
}

export function spanToTelemetryContract(span: Span): (Contracts.DependencyTelemetry & Contracts.RequestTelemetry) & Contracts.Identified {
const id = `|${span.context().traceId}.${span.context().spanId}.`;
const id = `|${span.spanContext().traceId}.${span.spanContext().spanId}.`;
const duration = Math.round(span["_duration"][0] * 1e3 + span["_duration"][1] / 1e6);
let peerAddress = span.attributes["peer.address"] ? span.attributes["peer.address"].toString() : "";
let component = span.attributes["component"] ? span.attributes["component"].toString() : "";
2 changes: 1 addition & 1 deletion AutoCollection/diagnostic-channel/azure-coretracing.sub.ts
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ let clients: TelemetryClient[] = [];
export const subscriber = (event: IStandardEvent<Span>) => {
const span = event.data;
const telemetry = SpanParser.spanToTelemetryContract(span);
const spanContext = span.context();
const spanContext = span.spanContext();
const traceparent = new Traceparent();
traceparent.traceId = spanContext.traceId;
traceparent.spanId = spanContext.spanId;
2 changes: 1 addition & 1 deletion Bootstrap/DiagnosticLogger.ts
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ export class DiagnosticLogger {
siteName: process.env.WEBSITE_SITE_NAME,
ikey: process.env.APPINSIGHTS_INSTRUMENTATIONKEY,
extensionVersion: process.env.ApplicationInsightsAgent_EXTENSION_VERSION,
sdkVersion: "2.1.3",
sdkVersion: "2.1.4",
subscriptionId: process.env.WEBSITE_OWNER_NAME ? process.env.WEBSITE_OWNER_NAME.split("+")[0] : null,
}
}
93 changes: 41 additions & 52 deletions package-lock.json
View file

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

10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
"author": "Microsoft Application Insights Team",
"license": "MIT",
"bugs": "https://github.com/microsoft/ApplicationInsights-node.js/issues",
"version": "2.1.3",
"version": "2.1.4",
"description": "Microsoft Application Insights module for Node.js",
"repository": {
"type": "git",
@@ -55,12 +55,12 @@
"typescript": "4.1.2"
},
"dependencies": {
"@azure/core-http": "^1.2.5",
"@opentelemetry/api": "^0.18.1",
"@opentelemetry/tracing": "^0.19.0",
"@azure/core-http": "^2.0.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/tracing": "^0.23.0",
"cls-hooked": "^4.2.2",
"continuation-local-storage": "^3.2.1",
"diagnostic-channel": "1.0.0",
"diagnostic-channel-publishers": "1.0.0"
"diagnostic-channel-publishers": "1.0.1"
}
}