-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[Monitor OpenTelemetry Exporter] Fix Dynamic Import #36085
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
Open
JacksonWeber
wants to merge
4
commits into
Azure:main
Choose a base branch
from
JacksonWeber:jacksonweber/fix-dynamic-import
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+102
−67
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,6 @@ import type { AzureMonitorExporterOptions } from "../../config.js"; | |
| import type { TelemetryItem as Envelope } from "../../generated/index.js"; | ||
| import { resourceMetricsToEnvelope } from "../../utils/metricUtils.js"; | ||
| import { AzureMonitorBaseExporter } from "../base.js"; | ||
| import { HttpSender } from "../../platform/index.js"; | ||
|
|
||
| /** | ||
| * Azure Monitor Statsbeat Exporter | ||
|
|
@@ -21,21 +20,34 @@ export class AzureMonitorStatsbeatExporter | |
| * Flag to determine if the Exporter is shutdown. | ||
| */ | ||
| private _isShutdown = false; | ||
| private _sender: HttpSender; | ||
| private _sender: any; | ||
| private _senderOptions: any; | ||
|
|
||
| /** | ||
| * Initializes a new instance of the AzureMonitorStatsbeatExporter class. | ||
| * @param options - Exporter configuration | ||
| */ | ||
| constructor(options: AzureMonitorExporterOptions) { | ||
| super(options, true); | ||
| this._sender = new HttpSender({ | ||
| // Store sender options for lazy initialization to avoid circular dependency | ||
| this._senderOptions = { | ||
| endpointUrl: this.endpointUrl, | ||
| instrumentationKey: this.instrumentationKey, | ||
| trackStatsbeat: this.trackStatsbeat, | ||
| exporterOptions: options, | ||
| isStatsbeatSender: true, | ||
| }); | ||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * Lazily initialize the sender to avoid circular dependency | ||
| */ | ||
| private async _getSender(): Promise<any> { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The return type should be more specific than Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||
| if (!this._sender) { | ||
| const { HttpSender } = await import("../../platform/nodejs/httpSender.js"); | ||
| this._sender = new HttpSender(this._senderOptions); | ||
| } | ||
| return this._sender; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -79,7 +91,8 @@ export class AzureMonitorStatsbeatExporter | |
|
|
||
| // Supress tracing until OpenTelemetry Metrics SDK support it | ||
| context.with(suppressTracing(context.active()), async () => { | ||
| resultCallback(await this._sender.exportEnvelopes(filteredEnvelopes)); | ||
| const sender = await this._getSender(); | ||
| resultCallback(await sender.exportEnvelopes(filteredEnvelopes)); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -88,7 +101,9 @@ export class AzureMonitorStatsbeatExporter | |
| */ | ||
| public async shutdown(): Promise<void> { | ||
| this._isShutdown = true; | ||
| return this._sender.shutdown(); | ||
| if (this._sender) { | ||
| return this._sender.shutdown(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,6 @@ import { | |
| ENV_APPLICATIONINSIGHTS_SDKSTATS_EXPORT_INTERVAL, | ||
| RetriableRestErrorTypes, | ||
| } from "../../Declarations/Constants.js"; | ||
| import { CustomerSDKStatsMetrics } from "../../export/statsbeat/customerSDKStats.js"; | ||
|
|
||
| const DEFAULT_BATCH_SEND_RETRY_INTERVAL_MS = 60_000; | ||
|
|
||
|
|
@@ -38,7 +37,7 @@ export abstract class BaseSender { | |
| private numConsecutiveRedirects: number; | ||
| private retryTimer: NodeJS.Timeout | null; | ||
| private networkStatsbeatMetrics: NetworkStatsbeatMetrics | undefined; | ||
| private customerSDKStatsMetrics: CustomerSDKStatsMetrics | undefined; | ||
| private customerSDKStatsMetrics: any; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Using Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||
| private longIntervalStatsbeatMetrics; | ||
| private statsbeatFailureCount: number = 0; | ||
| private batchSendRetryIntervalMs: number = DEFAULT_BATCH_SEND_RETRY_INTERVAL_MS; | ||
|
|
@@ -79,12 +78,24 @@ export abstract class BaseSender { | |
| ); | ||
| } | ||
| } | ||
| this.customerSDKStatsMetrics = CustomerSDKStatsMetrics.getInstance({ | ||
| instrumentationKey: options.instrumentationKey, | ||
| endpointUrl: options.endpointUrl, | ||
| disableOfflineStorage: this.disableOfflineStorage, | ||
| networkCollectionInterval: exportInterval, | ||
| }); | ||
| // Initialize customer SDK stats metrics asynchronously to avoid circular dependency | ||
| // Only initialize if not already set (e.g., by tests) | ||
| if (!this.customerSDKStatsMetrics) { | ||
| import("../../export/statsbeat/customerSDKStats.js") | ||
| .then(({ CustomerSDKStatsMetrics }) => CustomerSDKStatsMetrics.getInstance({ | ||
| instrumentationKey: options.instrumentationKey, | ||
| endpointUrl: options.endpointUrl, | ||
| disableOfflineStorage: this.disableOfflineStorage, | ||
| networkCollectionInterval: exportInterval, | ||
| })) | ||
| .then((metrics) => { | ||
| this.customerSDKStatsMetrics = metrics; | ||
| return; | ||
| }) | ||
| .catch((error) => { | ||
| diag.warn("Failed to initialize customer SDK stats metrics:", error); | ||
| }); | ||
| } | ||
| } | ||
| } | ||
| this.persister = new FileSystemPersist( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using
anytypes reduces type safety. Consider importing the HttpSender type separately from the implementation, or define proper interfaces for these properties to maintain type safety.Copilot uses AI. Check for mistakes.