Backed out 3 changesets (bug 1862002) for causing android xpcshell failures on test_OHTTP.

Backed out changeset cf0ec10fbd23 (bug 1862002)
Backed out changeset 712db400d295 (bug 1862002)
Backed out changeset 39425b9e5663 (bug 1862002)

Cargo.lock

@@ -1852,19 +1852,15 @@ dependencies = [
 name = "fog_control"
 version = "0.1.0"
 dependencies = [
- "bhttp",
  "cstr",
  "firefox-on-glean",
  "glean",
  "log",
- "mozbuild",
  "nserror",
  "nsstring",
- "ohttp",
  "once_cell",
  "static_prefs",
  "thin-vec",
- "thiserror",
  "url",
  "viaduct",
  "xpcom",

toolkit/components/glean/Cargo.toml

@@ -18,10 +18,6 @@ cstr = "0.2"
 viaduct = "0.1"
 url = "2.1"
 thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
-ohttp = { version = "0.3", default-features = false, features = ["gecko", "nss", "client"] }
-bhttp = "0.3"
-thiserror = "1.0"
-mozbuild = "0.1"
 
 [features]
 # Leave data collection enabled, but disable upload.

toolkit/components/glean/api/src/pings.rs

@@ -6,7 +6,7 @@
 //!
 //! The contents of this module are generated by
 //! `toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py`, from
-//! ping definitions files identified by `toolkit/components/glean/metrics_index.py`.
+//! 'toolkit/components/glean/pings.yaml`.
 
 include!(mozbuild::objdir_path!(
     "toolkit/components/glean/api/src/pings.rs"

toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py

@@ -230,32 +230,5 @@ def jog_file(output_fd, *args):
     return get_deps()
 
 
-def ohttp_pings(output_fd, *args):
-    all_objs, options = parse(args)
-    ohttp_pings = []
-    for ping in all_objs["pings"].values():
-        if ping.metadata.get("use_ohttp", False):
-            if ping.include_info_sections:
-                raise ParserError(
-                    "Cannot send pings with OHTTP that contain {client|ping}_info sections. Specify `metadata: include_info_sections: false`"
-                )
-            ohttp_pings.append(ping.name)
-
-    env = jinja2.Environment(
-        loader=jinja2.PackageLoader("run_glean_parser", "templates"),
-        trim_blocks=True,
-        lstrip_blocks=True,
-    )
-    env.filters["quote_and_join"] = lambda l: "\n| ".join(f'"{x}"' for x in l)
-    template = env.get_template("ohttp.jinja2")
-    output_fd.write(
-        template.render(
-            ohttp_pings=ohttp_pings,
-        )
-    )
-    output_fd.write("\n")
-    return get_deps()
-
-
 if __name__ == "__main__":
     main(sys.stdout, *sys.argv[1:])

toolkit/components/glean/build_scripts/glean_parser_ext/templates/ohttp.jinja2

@@ -1,13 +0,0 @@
-// -*- mode: Rust -*-
-
-// AUTOGENERATED BY glean_parser.  DO NOT EDIT.
-{# The rendered source is autogenerated, but this
-Jinja2 template is not. Please file bugs! #}
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-pub fn uses_ohttp(ping_name: &str) -> bool {
-    matches!(ping_name, {{ ohttp_pings|quote_and_join }})
-}

toolkit/components/glean/moz.build

@@ -199,17 +199,6 @@ if CONFIG["MOZ_ARTIFACT_BUILDS"]:
     # Once generated, it needs to be placed in GreD so it can be found.
     FINAL_TARGET_FILES += ["!jogfile.json"]
 
-# OHTTP support requires the fog_control crate know which pings wish to be sent
-# using OHTTP. fog_control has no access to the firefox_on_glean crate, so it
-# needs its own codegen.
-GeneratedFile(
-    "src/ohttp_pings.rs",
-    script="build_scripts/glean_parser_ext/run_glean_parser.py",
-    entry_point="ohttp_pings",
-    flags=[CONFIG["MOZ_APP_VERSION"]],
-    inputs=pings_yamls + tags_yamls,
-)
-
 DIRS += [
     "tests",  # Must be in DIRS, not TEST_DIRS or python-test won't find it.
     "xpcom",

toolkit/components/glean/pings.yaml

@@ -6,9 +6,8 @@
 # automatically converted to platform-specific code at build time using the
 # `glean_parser` PyPI package.
 
-# This file is for Internal FOG Use Only.
-# You probably don't want to add pings here. For more information consult:
-# https://firefox-source-docs.mozilla.org/toolkit/components/glean/user/new_definitions_file.html
+# This file is presently for Internal FOG Use Only.
+# You should not add pings here until probably about January of 2021.
 
 ---
 $schema: moz://mozilla.org/schemas/glean/pings/2-0-0

toolkit/components/glean/src/init/viaduct_uploader.rs

@@ -3,7 +3,6 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use glean::net::{PingUploadRequest, PingUploader, UploadResult};
-use std::result::Result;
 use url::Url;
 use viaduct::{Error::*, Request};
 
@@ -22,169 +21,53 @@ impl PingUploader for ViaductUploader {
     ///
     /// * `upload_request` - the ping and its metadata to upload.
     fn upload(&self, upload_request: PingUploadRequest) -> UploadResult {
-        log::trace!("FOG Ping Uploader uploading to {}", upload_request.url);
+        let PingUploadRequest {
+            url, body, headers, ..
+        } = upload_request;
+        log::trace!("FOG Ping Uploader uploading to {}", url);
+        let url_clone = url.clone();
+        let result: std::result::Result<UploadResult, viaduct::Error> = (move || {
+            // SAFETY NOTE: Safe because it returns a primitive by value.
+            if unsafe { FOG_TooLateToSend() } {
+                log::trace!("Attempted to send ping too late into shutdown.");
+                return Ok(UploadResult::done());
+            }
+            let debug_tagged = headers.iter().any(|(name, _)| name == "X-Debug-ID");
+            let localhost_port = static_prefs::pref!("telemetry.fog.test.localhost_port");
+            if localhost_port < 0
+                || (localhost_port == 0 && !debug_tagged && cfg!(feature = "disable_upload"))
+            {
+                log::info!("FOG Ping uploader faking success");
+                return Ok(UploadResult::http_status(200));
+            }
+            let parsed_url = Url::parse(&url_clone)?;
 
-        // SAFETY NOTE: Safe because it returns a primitive by value.
-        if unsafe { FOG_TooLateToSend() } {
-            log::trace!("Attempted to send ping too late into shutdown.");
-            return UploadResult::done();
-        }
+            log::info!("FOG Ping uploader uploading to {:?}", parsed_url);
 
-        let debug_tagged = upload_request
-            .headers
-            .iter()
-            .any(|(name, _)| name == "X-Debug-ID");
-        let localhost_port = static_prefs::pref!("telemetry.fog.test.localhost_port");
-        if localhost_port < 0
-            || (localhost_port == 0 && !debug_tagged && cfg!(feature = "disable_upload"))
-        {
-            log::info!("FOG Ping uploader faking success");
-            return UploadResult::http_status(200);
-        }
-
-        // Localhost-destined pings are sent without OHTTP,
-        // even if configured to use OHTTP.
-        let result = if localhost_port == 0 && should_ohttp_upload(&upload_request) {
-            ohttp_upload(upload_request)
-        } else {
-            viaduct_upload(upload_request)
-        };
+            let mut req = Request::post(parsed_url.clone()).body(body.clone());
+            for (header_key, header_value) in &headers {
+                req = req.header(header_key.to_owned(), header_value)?;
+            }
 
+            log::trace!("FOG Ping Uploader sending ping to {}", parsed_url);
+            let res = req.send()?;
+            Ok(UploadResult::http_status(res.status as i32))
+        })();
         log::trace!(
-            "FOG Ping Uploader completed uploading (Result {:?})",
+            "FOG Ping Uploader completed uploading to {} (Result {:?})",
+            url,
             result
         );
-
         match result {
             Ok(result) => result,
-            Err(ViaductUploaderError::Viaduct(ve)) => match ve {
-                NonTlsUrl | UrlError(_) => UploadResult::unrecoverable_failure(),
+            Err(NonTlsUrl | UrlError(_)) => UploadResult::unrecoverable_failure(),
+            Err(
                 RequestHeaderError(_)
                 | BackendError(_)
                 | NetworkError(_)
                 | BackendNotInitialized
-                | SetBackendError => UploadResult::recoverable_failure(),
-            },
-            Err(
-                ViaductUploaderError::Bhttp(_)
-                | ViaductUploaderError::Ohttp(_)
-                | ViaductUploaderError::Fatal,
-            ) => UploadResult::unrecoverable_failure(),
+                | SetBackendError,
+            ) => UploadResult::recoverable_failure(),
         }
     }
 }
-
-fn viaduct_upload(upload_request: PingUploadRequest) -> Result<UploadResult, ViaductUploaderError> {
-    let parsed_url = Url::parse(&upload_request.url)?;
-
-    log::info!("FOG viaduct uploader uploading to {:?}", parsed_url);
-
-    let mut req = Request::post(parsed_url.clone()).body(upload_request.body);
-    for (header_key, header_value) in &upload_request.headers {
-        req = req.header(header_key.to_owned(), header_value)?;
-    }
-
-    log::trace!("FOG viaduct uploader sending ping to {}", parsed_url);
-    let res = req.send()?;
-    Ok(UploadResult::http_status(res.status as i32))
-}
-
-fn should_ohttp_upload(upload_request: &PingUploadRequest) -> bool {
-    crate::ohttp_pings::uses_ohttp(&upload_request.ping_name)
-        && !upload_request.body_has_info_sections
-}
-
-fn ohttp_upload(upload_request: PingUploadRequest) -> Result<UploadResult, ViaductUploaderError> {
-    let config = get_config()?;
-    let binary_request = bhttp_encode(upload_request)?;
-    // TODO(bug XXX) - Don't keep init-ing and re-init-ing ohttp.
-    ohttp::init();
-    let ohttp_request = ohttp::ClientRequest::new(&config)?;
-    let (capsule, ohttp_response) = ohttp_request.encapsulate(&binary_request)?;
-
-    const OHTTP_RELAY_URL: &str = "https://mozilla-ohttp-dev.fastly-edge.com/";
-    let parsed_relay_url = Url::parse(OHTTP_RELAY_URL)?;
-
-    log::trace!("FOG ohttp uploader uploading to {}", parsed_relay_url);
-
-    const OHTTP_MESSAGE_CONTENT_TYPE: &str = "message/ohttp-req";
-    let req = Request::post(parsed_relay_url)
-        .header(
-            viaduct::header_names::CONTENT_TYPE,
-            OHTTP_MESSAGE_CONTENT_TYPE,
-        )?
-        .body(capsule);
-    let res = req.send()?;
-
-    if res.status == 200 {
-        // This just tells us the HTTP went well. Check OHTTP's status.
-        let binary_response = ohttp_response.decapsulate(&res.body)?;
-        let mut cursor = std::io::Cursor::new(binary_response);
-        let bhttp_message = bhttp::Message::read_bhttp(&mut cursor)?;
-        let res = bhttp_message
-            .control()
-            .status()
-            .ok_or(ViaductUploaderError::Fatal)?;
-        Ok(UploadResult::http_status(res as i32))
-    } else {
-        Ok(UploadResult::http_status(res.status as i32))
-    }
-}
-
-fn get_config() -> Result<Vec<u8>, ViaductUploaderError> {
-    // TODO(bug XXX) - Don't keep getting and regetting the config.
-    const OHTTP_CONFIG_URL: &str =
-        "https://stage.ohttp-gateway.nonprod.webservices.mozgcp.net/ohttp-configs";
-    log::trace!("Getting OHTTP config from {}", OHTTP_CONFIG_URL);
-    let parsed_config_url = Url::parse(OHTTP_CONFIG_URL)?;
-    Ok(Request::get(parsed_config_url).send()?.body)
-}
-
-/// Encode the ping upload request in binary HTTP.
-/// (draft-ietf-httpbis-binary-message)
-fn bhttp_encode(upload_request: PingUploadRequest) -> Result<Vec<u8>, ViaductUploaderError> {
-    let parsed_url = Url::parse(&upload_request.url)?;
-    let mut message = bhttp::Message::request(
-        "POST".into(),
-        parsed_url.scheme().into(),
-        parsed_url
-            .host_str()
-            .ok_or(ViaductUploaderError::Fatal)?
-            .into(),
-        parsed_url.path().into(),
-    );
-
-    upload_request
-        .headers
-        .into_iter()
-        .for_each(|(k, v)| message.put_header(k, v));
-
-    message.write_content(upload_request.body);
-
-    let mut encoded = vec![];
-    message.write_bhttp(bhttp::Mode::KnownLength, &mut encoded)?;
-
-    Ok(encoded)
-}
-
-/// Unioned error across upload backends.
-#[derive(Debug, thiserror::Error)]
-enum ViaductUploaderError {
-    #[error("bhttp::Error {0}")]
-    Bhttp(#[from] bhttp::Error),
-
-    #[error("ohttp::Error {0}")]
-    Ohttp(#[from] ohttp::Error),
-
-    #[error("viaduct::Error {0}")]
-    Viaduct(#[from] viaduct::Error),
-
-    #[error("Fatal upload error")]
-    Fatal,
-}
-
-impl From<url::ParseError> for ViaductUploaderError {
-    fn from(e: url::ParseError) -> Self {
-        ViaductUploaderError::Viaduct(viaduct::Error::from(e))
-    }
-}

toolkit/components/glean/src/lib.rs

@@ -28,7 +28,6 @@ extern crate cstr;
 extern crate xpcom;
 
 mod init;
-mod ohttp_pings;
 
 pub use init::fog_init;
 
@@ -47,7 +46,6 @@ static mut PENDING_BUF: Vec<u8> = Vec::new();
 // IPC serialization/deserialization methods
 // Crucially important that the first two not be called on multiple threads.
 
-/// # Safety
 /// Only safe if only called on a single thread (the same single thread you call
 /// fog_give_ipc_buf on).
 #[no_mangle]
@@ -61,7 +59,6 @@ pub unsafe extern "C" fn fog_serialize_ipc_buf() -> usize {
     }
 }
 
-/// # Safety
 /// Only safe if called on a single thread (the same single thread you call
 /// fog_serialize_ipc_buf on), and if buf points to an allocated buffer of at
 /// least buf_len bytes.
@@ -76,7 +73,6 @@ pub unsafe extern "C" fn fog_give_ipc_buf(buf: *mut u8, buf_len: usize) -> usize
     pending_len
 }
 
-/// # Safety
 /// Only safe if buf points to an allocated buffer of at least buf_len bytes.
 /// No ownership is transfered to Rust by this method: caller owns the memory at
 /// buf before and after this call.
@@ -96,9 +92,9 @@ pub unsafe extern "C" fn fog_use_ipc_buf(buf: *const u8, buf_len: usize) {
 pub extern "C" fn fog_set_debug_view_tag(value: &nsACString) -> nsresult {
     let result = glean::set_debug_view_tag(&value.to_string());
     if result {
-        NS_OK
+        return NS_OK;
     } else {
-        NS_ERROR_FAILURE
+        return NS_ERROR_FAILURE;
     }
 }
 
@@ -141,7 +137,7 @@ pub extern "C" fn fog_set_experiment_active(
         extra_values.len(),
         "Experiment extra keys and values differ in length."
     );
-    let extra = if extra_keys.is_empty() {
+    let extra = if extra_keys.len() == 0 {
         None
     } else {
         Some(

toolkit/components/glean/src/ohttp_pings.rs

@@ -1,13 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-//! This file contains the generated logic for ohttp pings.
-//!
-//! The contents of this module are generated by
-//! `toolkit/components/glean/build_scripts/glean_parser_ext/run_glean_parser.py`, from
-//! ping definitions files identified by `toolkit/components/glean/metrics_index.py`.
-
-include!(mozbuild::objdir_path!(
-    "toolkit/components/glean/src/ohttp_pings.rs"
-));

toolkit/components/glean/tests/pytest/jogfile_output

@@ -352,14 +352,6 @@
         "tomorrow",
         "upgrade"
       ]
-    ],
-    [
-      "not-ohttp",
-      false,
-      true,
-      true,
-      false,
-      []
     ]
   ]
 }

toolkit/components/glean/tests/pytest/pings_test.yaml

@@ -7,7 +7,7 @@
 # `glean_parser` PyPI package.
 
 ---
-$schema: moz://mozilla.org/schemas/glean/pings/2-0-0
+$schema: moz://mozilla.org/schemas/glean/pings/1-0-0
 
 not-baseline:
   description: >
@@ -114,19 +114,3 @@ not-deletion-request:
     - https://bugzilla.mozilla.org/show_bug.cgi?id=1587095#c6
   notification_emails:
     - glean-team@mozilla.com
-
-not-ohttp:
-  description: >
-    A fake OHTTP-using ping
-  include_client_id: false
-  metadata:
-    include_info_sections: false
-    use_ohttp: true
-  send_if_empty: true
-  bugs:
-    - https://bugzilla.mozilla.org/show_bug.cgi?id=1862002
-  data_reviews:
-    - https://bugzilla.mozilla.org/show_bug.cgi?id=1862002
-  notification_emails:
-    - chutten@mozilla.com
-    - glean-team@mozilla.com

toolkit/components/glean/tests/pytest/pings_test_output

@@ -76,19 +76,6 @@ pub static not_metrics: Lazy<Ping> = Lazy::new(|| {
     )
 });
 
-#[allow(non_upper_case_globals)]
-/// A fake OHTTP-using ping
-pub static not_ohttp: Lazy<Ping> = Lazy::new(|| {
-    Ping::new(
-        "not-ohttp",
-        false,
-        true,
-        true,
-        false,
-        vec![],
-    )
-});
-
 
 /// Instantiate custom pings once to trigger registration.
 ///
@@ -104,7 +91,6 @@ pub fn register_pings(application_id: Option<&str>) {
             let _ = &*not_deletion_request;
             let _ = &*not_events;
             let _ = &*not_metrics;
-            let _ = &*not_ohttp;
         }
     }
 }
@@ -128,7 +114,6 @@ pub(crate) fn submit_ping_by_id(id: u32, reason: Option<&str>) {
         2 => not_deletion_request.submit(reason),
         3 => not_events.submit(reason),
         4 => not_metrics.submit(reason),
-        5 => not_ohttp.submit(reason),
         _ => {
             // TODO: instrument this error.
             log::error!("Cannot submit unknown ping {} by id.", id);

toolkit/components/glean/tests/pytest/pings_test_output_cpp

@@ -56,13 +56,6 @@ constexpr glean::impl::Ping NotEvents(3);
  */
 constexpr glean::impl::Ping NotMetrics(4);
 
-/*
- * Generated from not-ohttp.
- *
- * A fake OHTTP-using ping
- */
-constexpr glean::impl::Ping NotOhttp(5);
-
 
 }  // namespace mozilla::glean_pings
 

toolkit/components/glean/tests/pytest/pings_test_output_js_cpp

@@ -33,17 +33,15 @@ constexpr char gPingStringTable[] = {
   /*    12 - "notDeletionRequest" */ 'n', 'o', 't', 'D', 'e', 'l', 'e', 't', 'i', 'o', 'n', 'R', 'e', 'q', 'u', 'e', 's', 't', '\0',
   /*    31 - "notEvents" */ 'n', 'o', 't', 'E', 'v', 'e', 'n', 't', 's', '\0',
   /*    41 - "notMetrics" */ 'n', 'o', 't', 'M', 'e', 't', 'r', 'i', 'c', 's', '\0',
-  /*    52 - "notOhttp" */ 'n', 'o', 't', 'O', 'h', 't', 't', 'p', '\0',
 };
 
 
 
 const ping_entry_t sPingByNameLookupEntries[] = {
   65536,
-  327732,
-  262185,
   131084,
-  196639
+  196639,
+  262185
 };
 
 
@@ -90,7 +88,7 @@ PingByNameLookup(const nsACString& aKey)
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,
+       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   2,
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   0,   0,   0,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -110,7 +108,7 @@ PingByNameLookup(const nsACString& aKey)
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  14,
+       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,

toolkit/components/glean/tests/pytest/pings_test_output_js_h

@@ -28,6 +28,6 @@ const char* GetPingName(ping_entry_t aEntry);
  */
 Maybe<uint32_t> PingByNameLookup(const nsACString&);
 
-extern const ping_entry_t sPingByNameLookupEntries[5];
+extern const ping_entry_t sPingByNameLookupEntries[4];
 }  // namespace mozilla::glean
 #endif  // mozilla_GleanJSPingsLookup_h

toolkit/components/glean/tests/test_pings.yaml

@@ -40,22 +40,3 @@ test-ping:
     - glean-team@mozilla.com
   no_lint:
     - REDUNDANT_PING
-
-test-ohttp-ping:
-  description: |
-    This ping is for tests only.
-    Resembles how OHTTP pings are defined.
-  include_client_id: false
-  metadata:
-    include_info_sections: false
-    use_ohttp: true
-  send_if_empty: true
-  bugs:
-    - https://bugzilla.mozilla.org/show_bug.cgi?id=1862002
-  data_reviews:
-    - https://bugzilla.mozilla.org/show_bug.cgi?id=1862002
-  notification_emails:
-    - chutten@mozilla.com
-    - glean-team@mozilla.com
-  no_lint:
-    - REDUNDANT_PING

toolkit/components/glean/tests/xpcshell/head.js

@@ -4,155 +4,3 @@
 const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
-
-ChromeUtils.defineESModuleGetters(this, {
-  HttpServer: "resource://testing-common/httpd.sys.mjs",
-  NetUtil: "resource://gre/modules/NetUtil.sys.mjs",
-});
-
-const PingServer = {
-  _httpServer: null,
-  _started: false,
-  _defers: [Promise.withResolvers()],
-  _currentDeferred: 0,
-
-  get port() {
-    return this._httpServer.identity.primaryPort;
-  },
-
-  get host() {
-    return this._httpServer.identity.primaryHost;
-  },
-
-  get started() {
-    return this._started;
-  },
-
-  registerPingHandler(handler) {
-    this._httpServer.registerPrefixHandler("/submit/", handler);
-  },
-
-  resetPingHandler() {
-    this.registerPingHandler(request => {
-      let r = request;
-      console.trace(
-        `defaultPingHandler() - ${r.method} ${r.scheme}://${r.host}:${r.port}${r.path}`
-      );
-      let deferred = this._defers[this._defers.length - 1];
-      this._defers.push(Promise.withResolvers());
-      deferred.resolve(request);
-    });
-  },
-
-  start() {
-    this._httpServer = new HttpServer();
-    this._httpServer.start(-1);
-    this._started = true;
-    this.clearRequests();
-    this.resetPingHandler();
-  },
-
-  stop() {
-    return new Promise(resolve => {
-      this._httpServer.stop(resolve);
-      this._started = false;
-    });
-  },
-
-  clearRequests() {
-    this._defers = [Promise.withResolvers()];
-    this._currentDeferred = 0;
-  },
-
-  promiseNextRequest() {
-    const deferred = this._defers[this._currentDeferred++];
-    // Send the ping to the consumer on the next tick, so that the completion gets
-    // signaled to Telemetry.
-    return new Promise(r =>
-      Services.tm.dispatchToMainThread(() => r(deferred.promise))
-    );
-  },
-
-  promiseNextPing() {
-    return this.promiseNextRequest().then(request =>
-      decodeRequestPayload(request)
-    );
-  },
-
-  async promiseNextRequests(count) {
-    let results = [];
-    for (let i = 0; i < count; ++i) {
-      results.push(await this.promiseNextRequest());
-    }
-
-    return results;
-  },
-
-  promiseNextPings(count) {
-    return this.promiseNextRequests(count).then(requests => {
-      return Array.from(requests, decodeRequestPayload);
-    });
-  },
-};
-
-/**
- * Decode the payload of an HTTP request into a ping.
- *
- * @param {object} request The data representing an HTTP request (nsIHttpRequest).
- * @returns {object} The decoded ping payload.
- */
-function decodeRequestPayload(request) {
-  let s = request.bodyInputStream;
-  let payload = null;
-
-  if (
-    request.hasHeader("content-encoding") &&
-    request.getHeader("content-encoding") == "gzip"
-  ) {
-    let observer = {
-      buffer: "",
-      onStreamComplete(loader, context, status, length, result) {
-        // String.fromCharCode can only deal with 500,000 characters
-        // at a time, so chunk the result into parts of that size.
-        const chunkSize = 500000;
-        for (let offset = 0; offset < result.length; offset += chunkSize) {
-          this.buffer += String.fromCharCode.apply(
-            String,
-            result.slice(offset, offset + chunkSize)
-          );
-        }
-      },
-    };
-
-    let scs = Cc["@mozilla.org/streamConverters;1"].getService(
-      Ci.nsIStreamConverterService
-    );
-    let listener = Cc["@mozilla.org/network/stream-loader;1"].createInstance(
-      Ci.nsIStreamLoader
-    );
-    listener.init(observer);
-    let converter = scs.asyncConvertData(
-      "gzip",
-      "uncompressed",
-      listener,
-      null
-    );
-    converter.onStartRequest(null, null);
-    converter.onDataAvailable(null, s, 0, s.available());
-    converter.onStopRequest(null, null, null);
-    // TODO: nsIScriptableUnicodeConverter is deprecated
-    // But I can't figure out how else to ungzip bodyInputStream.
-    let unicodeConverter = Cc[
-      "@mozilla.org/intl/scriptableunicodeconverter"
-    ].createInstance(Ci.nsIScriptableUnicodeConverter);
-    unicodeConverter.charset = "UTF-8";
-    let utf8string = unicodeConverter.ConvertToUnicode(observer.buffer);
-    utf8string += unicodeConverter.Finish();
-    payload = JSON.parse(utf8string);
-  } else {
-    let bytes = NetUtil.readInputStream(s, s.available());
-    payload = JSON.parse(new TextDecoder().decode(bytes));
-  }
-
-  return payload;
-}

toolkit/components/glean/tests/xpcshell/test_OHTTP.js

@@ -1,32 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-add_setup(async () => {
-  // FOG needs a profile dir to put its data in.
-  do_get_profile();
-
-  PingServer.start();
-
-  registerCleanupFunction(async () => {
-    await PingServer.stop();
-  });
-
-  Services.prefs.setIntPref(
-    "telemetry.fog.test.localhost_port",
-    PingServer.port
-  );
-  // Port pref needs to be set before init, so let's reset to reinit.
-  Services.fog.testResetFOG();
-});
-
-add_task(async () => {
-  PingServer.clearRequests();
-  GleanPings.testOhttpPing.submit();
-
-  let ping = await PingServer.promiseNextPing();
-
-  ok(!("client_info" in ping), "No client_info allowed.");
-  ok(!("ping_info" in ping), "No ping_info allowed.");
-});

toolkit/components/glean/tests/xpcshell/xpcshell.toml

@@ -30,5 +30,3 @@ skip-if = ["os == 'android'"] # Server Knobs on mobile will be handled by the sp
 
 ["test_MillionQ.js"]
 skip-if = ["os == 'android'"] # Android inits its own FOG, so the test won't work.
-
-["test_OHTTP.js"]