Merge branch 'main' into fix-666

open-telemetry · Nov 17, 2021 · 68c9f07 · 68c9f07
2 parents 47b5402 + e606cf1
commit 68c9f07
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,6 @@ members = [
     "opentelemetry-stackdriver",
     "opentelemetry-zipkin",
     "opentelemetry-zpages",
-    "examples/actix-udp",
     "examples/actix-http",
     "examples/actix-http-tracing",
     "examples/actix-udp",

diff --git a/deny.toml b/deny.toml
@@ -1,3 +1,10 @@
+exclude=[
+    "actix-http",
+    "actix-http-tracing",
+    "actix-udp",
+    "actix-udp-example"
+]
+
 [licenses]
 unlicensed = "deny"
 allow = [
@@ -17,4 +24,11 @@ version = "*"
 expression = "MIT AND ISC AND OpenSSL"
 license-files = [
     { path = "LICENSE", hash = 0xbd0eed23 }
+]
+
+[advisories]
+ignore = [
+    # time/chrono problems, have not been a problem in practice, not much we can do at this moment.
+    "RUSTSEC-2020-0071",
+    "RUSTSEC-2020-0159"
 ]