Commite75697b

committed

Explicit initialization of @azure/opentelemetry-instrumentation-azure-sdk

1 parent680294a commite75697bCopy full SHA for e75697b

File tree

+22

-10

lines changed

+22

-10

lines changed

Lines changed: 5 additions & 3 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 0 additions & 1 deletion

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,12 @@ process.env.APPLICATIONINSIGHTS_NO_AZURE_INSTRUMENTATION = 'true';`
`8`	`8`	`process.env.OTEL_SDK_DISABLED='true';`
`9`	`9`	`process.env.OTEL_INSTRUMENTATION_COMMON_DEFAULT_ENABLED='false';`
`10`	`10`
	`11`	`+// Setup analytics early to avoid race issues with open telemetry.`
	`12`	`+import{setupAnalytics}from"./services/analytics.js";`
	`13`	`+setupAnalytics();`
	`14`	`+`
`11`	`15`	`importdotenvfrom'dotenv';`
`12`	`16`	`importappfrom'./app.js';`
`13`		`-import{setupAnalytics}from"./services/analytics.js";`
`14`	`17`	`import{PackageJobProcessor}from'./services/packageJobProcessor.js';`
`15`	`18`
`16`	`19`	`constconfigResult=dotenv.config({`
`@@ -38,8 +41,6 @@ if (!jdk8Path \|\| !androidDevToolsPath) {`
`38`	`41`	`console.error("Couldn't find environment variables for JDK8 path or Android Dev tools",app.get("env"),jdk8Path,androidDevToolsPath);`
`39`	`42`	`}`
`40`	`43`
`41`		`-setupAnalytics();`
`42`		`-`
`43`	`44`	`// Kick off our background job processor.`
`44`	`45`	`// This periodically polls Redis for new Google Play packaging jobs and processes them.`
`45`	`46`	`constjobProcessor=newPackageJobProcessor();`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`import*asappInsightsfrom'applicationinsights';`
	`2`	`+import{NodeSDK}from'@opentelemetry/sdk-node';`
	`3`	`+import{ConsoleSpanExporter}from'@opentelemetry/sdk-trace-node';`
`2`	`4`
`3`	`5`	`enumAppInsightsStatus{`
`4`	`6`	`ENABLED=1,`
`@@ -9,8 +11,12 @@ enum AppInsightsStatus {`
`9`	`11`	`varappInsightsStatus:AppInsightsStatus=AppInsightsStatus.DEFAULT;`
`10`	`12`	`exportfunctionsetupAnalytics(){`
`11`	`13`	`try{`
`12`		`-// Environment variables are set at application startup in server.ts`
`13`		`-// to ensure they're configured before any Azure packages are imported`
	`14`	`+constsdk=newNodeSDK({`
	`15`	`+traceExporter:newConsoleSpanExporter(),`
	`16`	`+instrumentations:[],`
	`17`	`+});`
	`18`	`+`
	`19`	`+sdk.start();`
`14`	`20`
`15`	`21`	`appInsights.setup()`
`16`	`22`	`.setAutoCollectRequests(false)`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,11 @@ export class AzureStorageBlobService implements BlobStorage {`
`94`	`94`	`if(!this.blobServiceClientTask){`
`95`	`95`	`this.blobServiceClientTask=newPromise<BlobServiceClient>(async(resolve,reject)=>{`
`96`	`96`	`try{`
`97`		`-console.info("Initializing Azure services, including @azure/core-tracing...");`
	`97`	`+console.info("Initializing Azure services...");`
	`98`	`+`
	`99`	`+// Import Azure open telemetry in order to avoid race condition around@azure/core-tracing.`
	`100`	`+constazureOpenTelemetry=awaitimport("@azure/opentelemetry-instrumentation-azure-sdk");`
	`101`	`+azureOpenTelemetry.logger.info("Azure Open Telemetry initialized");`
`98`	`102`
`99`	`103`	`// Dynamic imports to prevent early loading of Azure packages`
`100`	`104`	`const{ BlobServiceClient}=awaitimport("@azure/storage-blob");`

Comments

(0)