@opentelemetry/resource-detector-gcp 0.27.5 → 0.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -24,6 +24,8 @@ declare class GcpDetector implements Detector {
|
|
|
24
24
|
private _getZone;
|
|
25
25
|
/** Gets cluster name from GCP instance metadata. */
|
|
26
26
|
private _getClusterName;
|
|
27
|
+
/** Gets hostname from GCP instance metadata. */
|
|
28
|
+
private _getHostname;
|
|
27
29
|
}
|
|
28
30
|
export declare const gcpDetector: GcpDetector;
|
|
29
31
|
export {};
|
|
@@ -42,15 +42,17 @@ class GcpDetector {
|
|
|
42
42
|
api_1.diag.debug('GcpDetector failed: GCP Metadata unavailable.');
|
|
43
43
|
return resources_1.Resource.empty();
|
|
44
44
|
}
|
|
45
|
-
const [projectId, instanceId, zoneId, clusterName] = await Promise.all([
|
|
45
|
+
const [projectId, instanceId, zoneId, clusterName, hostname] = await Promise.all([
|
|
46
46
|
this._getProjectId(),
|
|
47
47
|
this._getInstanceId(),
|
|
48
48
|
this._getZone(),
|
|
49
49
|
this._getClusterName(),
|
|
50
|
+
this._getHostname(),
|
|
50
51
|
]);
|
|
51
52
|
const attributes = {};
|
|
52
53
|
attributes[semantic_conventions_1.SemanticResourceAttributes.CLOUD_ACCOUNT_ID] = projectId;
|
|
53
54
|
attributes[semantic_conventions_1.SemanticResourceAttributes.HOST_ID] = instanceId;
|
|
55
|
+
attributes[semantic_conventions_1.SemanticResourceAttributes.HOST_NAME] = hostname;
|
|
54
56
|
attributes[semantic_conventions_1.SemanticResourceAttributes.CLOUD_AVAILABILITY_ZONE] = zoneId;
|
|
55
57
|
attributes[semantic_conventions_1.SemanticResourceAttributes.CLOUD_PROVIDER] =
|
|
56
58
|
semantic_conventions_1.CloudProviderValues.GCP;
|
|
@@ -107,6 +109,15 @@ class GcpDetector {
|
|
|
107
109
|
return '';
|
|
108
110
|
}
|
|
109
111
|
}
|
|
112
|
+
/** Gets hostname from GCP instance metadata. */
|
|
113
|
+
async _getHostname() {
|
|
114
|
+
try {
|
|
115
|
+
return await gcpMetadata.instance('hostname');
|
|
116
|
+
}
|
|
117
|
+
catch (_a) {
|
|
118
|
+
return '';
|
|
119
|
+
}
|
|
120
|
+
}
|
|
110
121
|
}
|
|
111
122
|
exports.gcpDetector = new GcpDetector();
|
|
112
123
|
//# sourceMappingURL=GcpDetector.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GcpDetector.js","sourceRoot":"","sources":["../../../src/detectors/GcpDetector.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,iCAAiC;AACjC,4CAA4C;AAC5C,4CAA0C;AAC1C,wDAKkC;AAClC,8CAA6C;AAC7C,8EAG6C;AAE7C;;;;GAIG;AACH,MAAM,WAAW;IACf;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,CAAC,OAAiC;QAC5C,IACE,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC;YAC1C,CAAC,CAAC,MAAM,WAAW,CAAC,WAAW,EAAE,CAAC,EAClC;YACA,UAAI,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAC5D,OAAO,oBAAQ,CAAC,KAAK,EAAE,CAAC;SACzB;QAED,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"GcpDetector.js","sourceRoot":"","sources":["../../../src/detectors/GcpDetector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentelemetry/resource-detector-gcp",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.28.0",
|
|
4
4
|
"description": "OpenTelemetry SDK resource detector for GCP",
|
|
5
5
|
"main": "build/src/index.js",
|
|
6
6
|
"types": "build/src/index.d.ts",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"semver": "7.3.5"
|
|
66
66
|
},
|
|
67
67
|
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-gcp#readme",
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "e3dfedccec7f249dcc637bf76db16e8d412538aa"
|
|
69
69
|
}
|