elastic-apm 4.7.1 → 4.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a42c0ce245df1d22209302a5047957fdc35532ef06e0834078200305377df50
-  data.tar.gz: 43cbfaca9d8b8d382bb95c42559a7a497e28926bf7067558741b57aa036842e0
+  metadata.gz: bdaeccf4158cad055c398f2f617bc94b4ccb975714c0e8770ec84360fab6a277
+  data.tar.gz: 0e3af4ae48aeb9f35818d69c54322dde5d5eb590496b579e0172f641d355f575
 SHA512:
-  metadata.gz: fe8f8a3f6228788632530c5ee4ecfcf8ade01e199aa5cc06bc40e1af68a54f75266d5fcae91aa4d2357bb57fbd54c62f357b24a6e89b841ac449ae75199b1603
-  data.tar.gz: 2d3f2ece8d92db1a43475384e284fc82678ca5bf8352ce3b5d384e682dfbf55c6324886de1a94f95641861ce808cadaa1f057e7956c2b46fe4ab39db213fa0c1
+  metadata.gz: 6349f41ace14b70f7666fca71a15f96798c9786e4995f0206dab38b308b494a8cf34f8bdd432e64683e98a460e24e3168d8251a78050fe89bd7ac52fe6ce1728
+  data.tar.gz: f28824268f7ffa1806078fc9f24d469fef14218ac21f462edc8e1a4f6a1bf66aed7ceb847cbbcbe09227c9294a16bd739c2d6cb010d296e33f77c4d16957baca

data/CHANGELOG.asciidoc

@@ -34,6 +34,13 @@ endif::[]
 [[release-notes-4.x]]
 === Ruby Agent version 4.x
 
+[[release-notes-4.7.2]
+==== 4.7.2
+
+[float]
+===== Fixed
+- Address machineType not being returned in GCP metadata {pull}1435[#1435]
+
 [[release-notes-4.7.1]
 ==== 4.7.1
 

data/lib/elastic_apm/metadata/cloud_info.rb

@@ -94,15 +94,18 @@ module ElasticAPM
         return unless resp.status == 200
         return unless (metadata = JSON.parse(resp.body.to_s))
 
-        zone = metadata["instance"]["zone"]&.split("/")&.at(-1)
-
         self.provider = "gcp"
-        self.instance_id = metadata["instance"]["id"].to_s
-        self.instance_name = metadata["instance"]["name"]
         self.project_id = metadata["project"]["projectId"]
+
+        return unless metadata['instance']
+
+        zone = metadata["instance"]["zone"]&.split("/")&.at(-1)
         self.availability_zone = zone
         self.region = zone.split("-")[0..-2].join("-")
-        self.machine_type = metadata["instance"]["machineType"].split("/")[-1]
+
+        self.instance_id = metadata["instance"]["id"].to_s
+        self.instance_name = metadata["instance"]["name"]
+        self.machine_type = metadata["instance"]["machineType"]&.split("/")&.at(-1)
       rescue HTTP::TimeoutError, HTTP::ConnectionError
         nil
       end

data/lib/elastic_apm/version.rb

@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '4.7.1'
+  VERSION = '4.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.2
 platform: ruby
 authors:
 - Mikkel Malmberg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby