fix: add parsing to Cluster JSON response

open-telemetry · Dec 3, 2020 · 20d7ea4 · 20d7ea4
1 parent 43a8820
commit 20d7ea4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/packages/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts b/packages/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts
@@ -325,6 +325,9 @@ export class AwsEksDetector implements Detector {
    * the identity properties in a local map.
    */
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> eda056317... fix: add parsing to Cluster JSON response
   private async _fetchString(options: https.RequestOptions): Promise<string> {
     return await new Promise((resolve, reject) => {
 =======