Merge branch 'main' into fix_invalid_max_shutdown_duration_documentation

open-telemetry · Jan 18, 2024 · 083f010 · 083f010
2 parents 5951fd2 + 3827119
commit 083f010
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,6 @@ target/
 *.pdb
 /.vscode/
 Cargo.lock
+
+# Generated by RustRover
+.idea/
diff --git a/opentelemetry-stackdriver/Cargo.toml b/opentelemetry-stackdriver/Cargo.toml
@@ -17,10 +17,11 @@ http = "0.2"
 hyper = "0.14.2"
 hyper-rustls = { version = "0.24", optional = true }
 # TODO: Replace with opentelemetry version before release
-opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", branch = "main" }
+opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "6175c3" }
 # TODO: Replace with opentelemetry version before release
-opentelemetry_sdk = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", branch = "main" }
-opentelemetry-semantic-conventions = { version = "0.13" }
+opentelemetry_sdk = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "6175c3" }
+# TODO: Replace with opentelemetry version before release
+opentelemetry-semantic-conventions = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "6175c3" }
 prost = "0.11.0"
 prost-types = "0.11.1"
 thiserror = "1.0.30"