diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a6dfcb18b..7bcbcbfbbb 100644 --- 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 index c2757fe90d..2b877f8909 100644 --- 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 index fa4367717c..8a3d9fbf29 100644 --- 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 index 641fa51ee7..58d87ccaa4 100644 --- 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 index a4bb50f71c..31f8ac6681 100644 --- 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