chore: merge

kirrg001 · kirrg001 · commit dfecdd6c1540 · 2025-03-04T10:04:08.000+01:00
diff --git a/packages/opentelemetry-exporter/src/index.js b/packages/opentelemetry-exporter/src/index.js
@@ -97,11 +97,8 @@ class InstanaExporter {
     instanaEnvironment.validate();
 
     if (instanaEnvironment.isValid()) {
-<<<<<<< HEAD
-      instanaBackendConnector.init({ config: { logger }, stopSendingOnFailure: false, propagateErrorsUpstream: true });
-=======
-      instanaBackendConnector.init({ logger }, null, true);
->>>>>>> bb612d3e (chore: cleanup)
+      instanaBackendConnector.init({ config: { logger }, propagateErrorsUpstream: true });
+
       this._isShutdown = false;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,8 @@ class InstanaExporter {`
`97`	`97`	`instanaEnvironment.validate();`
`98`	`98`
`99`	`99`	`if (instanaEnvironment.isValid()) {`
`100`		`-<<<<<<< HEAD`
`101`		`- instanaBackendConnector.init({ config: { logger }, stopSendingOnFailure: false, propagateErrorsUpstream: true });`
`102`		`-=======`
`103`		`- instanaBackendConnector.init({ logger }, null, true);`
`104`		`->>>>>>> bb612d3e (chore: cleanup)`
	`100`	`+ instanaBackendConnector.init({ config: { logger }, propagateErrorsUpstream: true });`
	`101`	`+`
`105`	`102`	`this._isShutdown = false;`
`106`	`103`	`}`
`107`	`104`	`}`