Merge branch 'main' into create-logs-api-gem

open-telemetry · Aug 1, 2023 · 611909a · 611909a
2 parents 4f0eb52 + 7c1f352
commit 611909a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-api
 
+### v1.2.1 / 2023-07-29
+
+* DOCS: Describe Tracer#in_span arguments
+
 ### v1.2.0 / 2023-06-08
 
 * BREAKING CHANGE: Remove support for EoL Ruby 2.7 

diff --git a/api/lib/opentelemetry/version.rb b/api/lib/opentelemetry/version.rb
@@ -6,5 +6,5 @@
 
 module OpenTelemetry
   ## Current OpenTelemetry version
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end
diff --git a/exporter/otlp/CHANGELOG.md b/exporter/otlp/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release History: opentelemetry-exporter-otlp
 
+### v0.26.1 / 2023-07-29
+
+* FIXED: Regenerate v0.20.0 protos
+* ADDED: Allow google-protobuf ~> 3.14
+
 ### v0.26.0 / 2023-06-13
 
 * ADDED: Use OTLP 0.20.0 protos 

diff --git a/exporter/otlp/lib/opentelemetry/exporter/otlp/version.rb b/exporter/otlp/lib/opentelemetry/exporter/otlp/version.rb
@@ -8,7 +8,7 @@ module OpenTelemetry
   module Exporter
     module OTLP
       ## Current OpenTelemetry OTLP exporter version
-      VERSION = '0.26.0'
+      VERSION = '0.26.1'
     end
   end
 end