Merge branch 'main' into paymentservice-checkoutservice-introduce-new…

…-featureflags
open-telemetry · Mar 14, 2024 · 8e93e89 · 8e93e89
2 parents 7794f15 + 4862828
commit 8e93e89
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 74 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ keeping it up to date for you.
 | [AppDynamics][AppDynamics]              | [Google Cloud][GoogleCloud] | [OpenSearch][OpenSearch]                                       |
 | [Aspecto][Aspecto]                      | [Grafana Labs][GrafanaLabs] | [Sentry][Sentry]                                               |
 | [Axiom][Axiom]                          | [Guance][Guance]            | [ServiceNow Cloud Observability][ServiceNowCloudObservability] |
-| [Axoflow][Axoflow]                      | [Helios][Helios]            | [Splunk][Splunk]                                               |
+| Axoflow                                 | [Helios][Helios]            | [Splunk][Splunk]                                               |
 | [Azure Data Explorer][Azure]            | [Honeycomb.io][Honeycombio] | [Sumo Logic][SumoLogic]                                        |
 | [Coralogix][Coralogix]                  | [Instana][Instana]          | [TelemetryHub][TelemetryHub]                                   |
 | [Dash0][Dash0]                          | [Kloudfuse][Kloudfuse]      | [Teletrace][Teletrace]                                         |
@@ -109,7 +109,6 @@ Emeritus:
 [AppDynamics]: https://www.appdynamics.com/blog/cloud/how-to-observe-opentelemetry-demo-app-in-appdynamics-cloud/
 [Aspecto]: https://github.com/aspecto-io/opentelemetry-demo
 [Axiom]: https://play.axiom.co/axiom-play-qf1k/dashboards/otel.traces.otel-demo-traces
-[Axoflow]: https://axoflow.com/opentelemetry-support-in-more-detail-in-axosyslog-and-syslog-ng/
 [Azure]: https://github.com/Azure/Azure-kusto-opentelemetry-demo
 [Coralogix]: https://coralogix.com/blog/configure-otel-demo-send-telemetry-data-coralogix
 [Dash0]: https://github.com/dash0hq/opentelemetry-demo

diff --git a/src/flagd/demo.flagd.json b/src/flagd/demo.flagd.json
@@ -1,72 +1,56 @@
 {
-    "$schema": "https://flagd.dev/schema/v0/flags.json",
-    "flags": {
-        "productCatalogFailure": {
-            "description": "Fail product catalog service on a specific product",
-            "state": "ENABLED",
-            "variants": {
-                "on": true,
-                "off": false
-              },
-              "defaultVariant": "off"
-        },
-        "recommendationServiceCacheFailure": {
-            "description": "Fail recommendation service cache",
-            "state": "ENABLED",
-            "variants": {
-                "on": true,
-                "off": false
-              },
-              "defaultVariant": "off"
-        },
-        "adServiceFailure": {
-            "description": "Fail ad service",
-            "state": "ENABLED",
-            "variants": {
-                "on": true,
-                "off": false
-              },
-              "defaultVariant": "off",
-              "targeting": {
-                "fractional": [
-                  { "var": "session" },
-                  [
-                    "on",
-                    10
-                  ],
-                  [
-                    "off",
-                    90
-                  ]
-                ]
-              }
-        },
-        "cartServiceFailure": {
-            "description": "Fail cart service",
-            "state": "ENABLED",
-            "variants": {
-                "on": true,
-                "off": false
-              },
-              "defaultVariant": "off"
-        },
-        "paymentServiceFailure": {
-          "description": "Fail payment service charge requests",
-          "state": "ENABLED",
-          "variants": {
-              "on": true,
-              "off": false
-            },
-            "defaultVariant": "off"
-        },
-        "paymentServiceUnreachable": {
-          "description": "Payment service is unavailable",
-          "state": "ENABLED",
-          "variants": {
-              "on": true,
-              "off": false
-            },
-            "defaultVariant": "off"
-        }
+  "$schema": "https://flagd.dev/schema/v0/flags.json",
+  "flags": {
+    "productCatalogFailure": {
+      "description": "Fail product catalog service on a specific product",
+      "state": "ENABLED",
+      "variants": {
+        "on": true,
+        "off": false
+      },
+      "defaultVariant": "off"
+    },
+    "recommendationServiceCacheFailure": {
+      "description": "Fail recommendation service cache",
+      "state": "ENABLED",
+      "variants": {
+        "on": true,
+        "off": false
+      },
+      "defaultVariant": "off"
+    },
+    "adServiceFailure": {
+      "description": "Fail ad service",
+      "state": "ENABLED",
+      "variants": {
+        "on": true,
+        "off": false
+      },
+      "defaultVariant": "off",
+      "targeting": {
+        "fractional": [
+          {
+            "var": "session"
+          },
+          [
+            "on",
+            10
+          ],
+          [
+            "off",
+            90
+          ]
+        ]
+      }
+    },
+    "cartServiceFailure": {
+      "description": "Fail cart service",
+      "state": "ENABLED",
+      "variants": {
+        "on": true,
+        "off": false
+      },
+      "defaultVariant": "off"
     }
-  }
+  }
+}
diff --git a/src/grafana/provisioning/dashboards/demo/demo-dashboard.json b/src/grafana/provisioning/dashboards/demo/demo-dashboard.json
@@ -1022,4 +1022,4 @@
   "uid": "W2gX2zHVk",
   "version": 1,
   "weekStart": ""
-}
+}
diff --git a/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json b/src/grafana/provisioning/dashboards/demo/opentelemetry-collector.json
@@ -3362,4 +3362,4 @@
   "uid": "BKf2sowmj",
   "version": 72,
   "weekStart": ""
-}
+}