Skip to content
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
3 changes: 3 additions & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { AZURE_MONITOR_STATSBEAT_FEATURES, AzureMonitorOpenTelemetryOptions } fr
import { ApplicationInsightsConfig } from "./shared/configuration/config";
import { LogApi } from "./shim/logsApi";
import { StatsbeatFeature, StatsbeatInstrumentation } from "./shim/types";
import { RequestSpanProcessor } from "./traces/requestProcessor";

let autoCollectLogs: AutoCollectLogs;
let exceptions: AutoCollectExceptions;
Expand All @@ -31,6 +32,8 @@ export function useAzureMonitor(options?: AzureMonitorOpenTelemetryOptions) {
instrumentation: StatsbeatInstrumentation.NONE,
feature: StatsbeatFeature.SHIM
});
// Allows for full filtering of dependency/request spans
options.spanProcessors = [new RequestSpanProcessor(options.enableAutoCollectDependencies, options.enableAutoCollectRequests)];
distroUseAzureMonitor(options);
const internalConfig = new ApplicationInsightsConfig(options);
const logApi = new LogApi(logs.getLogger("ApplicationInsightsLogger"));
Expand Down
8 changes: 8 additions & 0 deletions src/shim/shim-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,14 @@ class Config implements IConfig {
options.enableAutoCollectExceptions = this.enableAutoCollectExceptions;
}

if (typeof (this.enableAutoCollectRequests) === "boolean") {
options.enableAutoCollectRequests = this.enableAutoCollectRequests;
}

if (typeof (this.enableAutoCollectDependencies) === "boolean") {
options.enableAutoCollectDependencies = this.enableAutoCollectDependencies;
}

if (this.enableAutoCollectDependencies === false && this.enableAutoCollectRequests === false) {
options.instrumentationOptions.http.enabled = false;
}
Expand Down
44 changes: 44 additions & 0 deletions src/traces/requestProcessor.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.

import { Context, SpanKind, TraceFlags } from "@opentelemetry/api";
import { ReadableSpan, Span, SpanProcessor } from "@opentelemetry/sdk-trace-base";

/**
* Azure Monitor Incoming & Outgoing Request Processor.
* @internal
*/
export class RequestSpanProcessor implements SpanProcessor {
private _enableDependencyTelemetry: boolean;
private _enableRequestTelemetry: boolean;

constructor(enableDependencyTelemetry: boolean, enableRequestTelemetry: boolean) {
this._enableDependencyTelemetry = enableDependencyTelemetry;
this._enableRequestTelemetry = enableRequestTelemetry;
}

forceFlush(): Promise<void> {
return Promise.resolve();
}

onStart(span: Span, _context: Context): void {
if (this._enableDependencyTelemetry === false) {
if (span.kind === SpanKind.CLIENT || span.kind === SpanKind.PRODUCER) {
span.spanContext().traceFlags = TraceFlags.SAMPLED;
}
}
if (this._enableRequestTelemetry === false) {
if (span.kind === SpanKind.SERVER || span.kind === SpanKind.CONSUMER) {
span.spanContext().traceFlags = TraceFlags.SAMPLED;
}
}
}

onEnd(span: ReadableSpan): void {
return;
}

shutdown(): Promise<void> {
return Promise.resolve();
}
}
2 changes: 2 additions & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ export interface AzureMonitorOpenTelemetryOptions extends DistroOptions {
* if true performance counters will be collected every second and sent to Azure Monitor
*/
enableAutoCollectPerformance?: boolean;
enableAutoCollectDependencies?: boolean;
enableAutoCollectRequests?: boolean;
}

export interface InstrumentationOptions extends DistroInstrumentationOptions {
Expand Down
2 changes: 1 addition & 1 deletion test/unitTests/agent/aksLoader.tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ describe("agent/AKSLoader", () => {
assert.equal(meterProvider["_sharedState"]["metricCollectors"][0]["_metricReader"]["_exporter"].constructor.name, "AzureMonitorMetricExporter");
let tracerProvider = ((trace.getTracerProvider() as ProxyTracerProvider).getDelegate()) as any;
assert.equal(tracerProvider.constructor.name, "NodeTracerProvider");
assert.equal(tracerProvider["_registeredSpanProcessors"][1]["_exporter"].constructor.name, "AzureMonitorTraceExporter");
assert.equal(tracerProvider["_registeredSpanProcessors"][2]["_exporter"].constructor.name, "AzureMonitorTraceExporter");
let loggerProvider = logs.getLoggerProvider() as any;
assert.equal(loggerProvider.constructor.name, "LoggerProvider");
assert.equal(loggerProvider["_sharedState"]["registeredLogRecordProcessors"][1]["_exporter"].constructor.name, "AzureMonitorLogExporter");
Expand Down
4 changes: 2 additions & 2 deletions test/unitTests/main.tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ describe("ApplicationInsightsClient", () => {

let tracerProvider = ((trace.getTracerProvider() as ProxyTracerProvider).getDelegate() as any);
let spanProcessors = tracerProvider["_registeredSpanProcessors"];
assert.ok(spanProcessors.length == 3, "wrong number of spanProcessors");
otlpExporter = spanProcessors[2]["_exporter"];
assert.ok(spanProcessors.length == 4, "wrong number of spanProcessors");
otlpExporter = spanProcessors[3]["_exporter"];
assert.ok(otlpExporter instanceof OTLPTraceExporter, "wrong exporter");

let loggerProvider = ((logs.getLoggerProvider() as LoggerProvider) as any);
Expand Down
9 changes: 9 additions & 0 deletions test/unitTests/shim/applicationInsights.tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ describe("ApplicationInsights", () => {
assert.equal(JSON.stringify((appInsights.defaultClient["_options"].instrumentationOptions as InstrumentationOptions).winston), JSON.stringify({ enabled: false }));
});

it("should set dependency and request collection", () => {
appInsights.setup(connString)
.setAutoCollectRequests(true)
.setAutoCollectDependencies(false)
appInsights.start();
assert.equal(appInsights.defaultClient["_options"].enableAutoCollectDependencies, false);
assert.equal(appInsights.defaultClient["_options"].enableAutoCollectRequests, true);
});

describe("#CorrelationContext", () => {
it("should return context once AppInsights is intialized", () => {
appInsights.setup(connString).start();
Expand Down
Loading