working push to grafana cloud

Cargo.toml

@@ -9,18 +9,19 @@ crate-type = ["cdylib"]
 
 [dependencies]
 graphql_client = "0.14.0"
-serde = "1.0.200"
+serde = "1.0.201"
 worker = "0.2.0"
 reqwest = { version = "0.12.4", features = ["json"] }
-opentelemetry = { version = "=0.22.0", features = ["otel_unstable"] }
-opentelemetry_sdk = { version="=0.22.1", default-features = false, features = ["trace", "metrics", "rt-tokio-current-thread"] }
-opentelemetry-stdout = { version="0.3.0", default-features = false, features=["trace", "metrics"] }
-getrandom = { version = "0.2.14", features = ["js"] }
-serde_json = "1.0.116"
-opentelemetry-otlp = { version="0.15.0", features = ["metrics", "http-proto"], default-features = false }
+opentelemetry = { version = "=0.22.0", default-features = false, features = ["metrics"] }
+opentelemetry_sdk = { version="=0.22.1", default-features = false, features = ["metrics"] }
+getrandom = { version = "0.2.15", features = ["js"] }
+serde_json = "1.0.117"
+opentelemetry-otlp = { version="0.15.0", default-features = false, features = ["metrics", "http-proto"] }
+opentelemetry-proto = { version = "0.5.0", default-features = false, features = ["metrics", "with-serde"] }
 prometheus = "0.13.4"
 web-time = "1.1.0"
 chrono = "0.4.38"
+prost = "0.12.4"
 
 [profile.release]
 opt-level = "s" # optimize for size in release builds

features/o11y.feature

@@ -4,7 +4,5 @@ Feature: OpenTelemetry metrics
     Given Worker is configured to send metrics to a mock OpenTelemetry collector
     When  Worker is triggered
     Then  Worker metrics are published
-    And   Metric name should include "cloudflare_worker_requests"
-    And   Metric name should include "cloudflare_worker_errors"
-    And   Metric name should include "cloudflare_worker_cpu_time"
-    And   Metric name should include "cloudflare_worker_duration"
+    And   Metric name should include "cloudflare_worker"
+    And   Metric name should include "cloudflare_worker_cpu"

features/step_definitions/mf.ts

@@ -62,6 +62,7 @@ export class MiniflareDriver {
                     CLOUDFLARE_API_URL: self.config.cloudflareApiUrl,
                     CLOUDFLARE_API_KEY: "fake-key",
                     CLOUDFLARE_ACCOUNT_ID: "1234",
+                    OTLP_ENCODING: "json",
                 },
                 modulesRules: [
                     { type: "CompiledWasm", include: ["**/*.wasm"], fallthrough: true },

features/step_definitions/otel_server.ts

@@ -40,11 +40,13 @@ export class OpenTelemetryServer {
     indexMetrics() {
         let self = this;
         this.metricNames.clear();
+        console.log(JSON.stringify(this.metrics, null, 2));
         for (let metrics of this.metrics) {
-            let resourceMetrics = metrics.resourceMetrics as unknown as IResourceMetrics;
-            for (let scopeMetrics of resourceMetrics.scopeMetrics) {
-                for (let metric of scopeMetrics.metrics) {
-                    self.metricNames.set(metric.name, 1);
+            for (let resourceMetrics of metrics.resourceMetrics) {
+                for (let scopeMetrics of resourceMetrics.scopeMetrics) {
+                    for (let metric of scopeMetrics.metrics) {
+                        self.metricNames.set(metric.name, 1);
+                    }
                 }
             }
         }

src/gql.rs

@@ -5,6 +5,7 @@ use prometheus::{CounterVec, GaugeVec, Opts, Registry};
 use crate::metrics::prometheus_registry_to_opentelemetry_metrics;
 use web_time::SystemTime;
 use chrono::NaiveDateTime;
+use worker::console_log;
 
 // The paths are relative to the directory where your `Cargo.toml` is located.
 // Both json and the GraphQL schema language are supported as sources for the schema
@@ -37,10 +38,17 @@ pub async fn perform_my_query(cloudflare_api_url: String, cloudflare_api_key: St
     let res = client.post(cloudflare_api_url)
         .bearer_auth(cloudflare_api_key)
         .json(&request_body).send().await?;
+
     if !res.status().is_success() {
+        console_log!("GraphQL query failed: {:?}", res.status());
         return Err(Box::new(res.error_for_status().unwrap_err()));
     }
+
     let response_body: Response<get_workers_analytics_query::ResponseData> = res.json().await?;
+    if response_body.errors.is_some() {
+        console_log!("GraphQL query failed: {:?}", response_body.errors);
+        return Err(Box::new(worker::Error::JsError("graphql".parse().unwrap())));
+    }
     let response_data: get_workers_analytics_query::ResponseData = response_body.data.expect("missing response data");
 
     let registry = Registry::new();