Merge branch 'open-telemetry:main' into main

solarwinds · Dec 12, 2023 · 10eb21a · 10eb21a
2 parents 556c02b + ff9a7d3
commit 10eb21a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,6 +19,7 @@ jobs:
           - opentelemetry-common
           - opentelemetry-logs-api
           - opentelemetry-metrics-api
+          - opentelemetry-metrics-sdk
           - opentelemetry-registry
           - opentelemetry-sdk
           - opentelemetry-sdk-experimental

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -31,7 +31,7 @@ jobs:
         tools: latest
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/exporter/jaeger/lib/opentelemetry/exporter/jaeger/encoder.rb b/exporter/jaeger/lib/opentelemetry/exporter/jaeger/encoder.rb
@@ -35,9 +35,9 @@ module Encoder # rubocop:disable Metrics/ModuleLength
 
         def encoded_process(resource)
           service_name = DEFAULT_SERVICE_NAME
-          tags = resource&.attribute_enumerator&.select do |key, value|
+          tags = resource&.attribute_enumerator&.reject do |key, value|
             service_name = value if key == 'service.name'
-            key != 'service.name'
+            key == 'service.name'
           end
           tags = encoded_tags(tags)
           Thrift::Process.new('serviceName' => service_name, 'tags' => tags)

diff --git a/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram.rb b/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/explicit_bucket_histogram.rb
@@ -32,9 +32,10 @@ def initialize(
           def collect(start_time, end_time)
             if @aggregation_temporality == :delta
               # Set timestamps and 'move' data point values to result.
-              hdps = @data_points.each_value do |hdp|
+              hdps = @data_points.values.map! do |hdp|
                 hdp.start_time_unix_nano = start_time
                 hdp.time_unix_nano = end_time
+                hdp
               end
               @data_points.clear
               hdps

diff --git a/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/sum.rb b/metrics_sdk/lib/opentelemetry/sdk/metrics/aggregation/sum.rb
@@ -19,9 +19,10 @@ def initialize(aggregation_temporality: :delta)
           def collect(start_time, end_time)
             if @aggregation_temporality == :delta
               # Set timestamps and 'move' data point values to result.
-              ndps = @data_points.each_value do |ndp|
+              ndps = @data_points.values.map! do |ndp|
                 ndp.start_time_unix_nano = start_time
                 ndp.time_unix_nano = end_time
+                ndp
               end
               @data_points.clear
               ndps