Skip to content

Commit cf0ce68

Browse files
committed
Remove experimental tracing
Removes the otel tracing added in [#652](#652) which was introduced before the `libcnb` tracing support in [heroku/libcnb.rs#723](heroku/libcnb.rs#723). This is also blocking the dependency updates in [#942](#942).
1 parent 0b9fc8c commit cf0ce68

File tree

6 files changed

+43
-203
lines changed

6 files changed

+43
-203
lines changed

Cargo.lock

Lines changed: 6 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

buildpacks/nodejs-corepack/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ heroku-nodejs-utils.workspace = true
1111
indoc = "2"
1212
libcnb = { version = "=0.23.0", features = ["trace"] }
1313
libherokubuildpack = { version = "=0.23.0", default-features = false, features = ["log"] }
14-
opentelemetry = "0.24"
1514
serde = "1"
1615
thiserror = "1"
1716

buildpacks/nodejs-corepack/src/main.rs

Lines changed: 37 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
use heroku_nodejs_utils::package_json::{PackageJson, PackageJsonError};
2-
use heroku_nodejs_utils::telemetry::init_tracer;
32
use libcnb::build::{BuildContext, BuildResult, BuildResultBuilder};
43
use libcnb::data::build_plan::BuildPlanBuilder;
54
use libcnb::detect::{DetectContext, DetectResult, DetectResultBuilder};
65
use libcnb::generic::GenericMetadata;
76
use libcnb::generic::GenericPlatform;
87
use libcnb::{buildpack_main, Buildpack, Env};
98
use libherokubuildpack::log::log_header;
10-
use opentelemetry::trace::{TraceContextExt, Tracer};
11-
use opentelemetry::KeyValue;
129

1310
use crate::enable_corepack::enable_corepack;
1411
use crate::prepare_corepack::prepare_corepack;
@@ -35,67 +32,51 @@ impl Buildpack for CorepackBuildpack {
3532
type Error = CorepackBuildpackError;
3633

3734
fn detect(&self, context: DetectContext<Self>) -> libcnb::Result<DetectResult, Self::Error> {
38-
let tracer = init_tracer(context.buildpack_descriptor.buildpack.id.to_string());
39-
tracer.in_span("nodejs-corepack-detect", |_cx| {
40-
// Corepack requires the `packageManager` key from `package.json`.
41-
// This buildpack won't be detected without it.
42-
let pkg_json_path = context.app_dir.join("package.json");
43-
if pkg_json_path.exists() {
44-
let pkg_json = PackageJson::read(pkg_json_path)
45-
.map_err(CorepackBuildpackError::PackageJson)?;
46-
cfg::get_supported_package_manager(&pkg_json).map_or_else(
47-
|| DetectResultBuilder::fail().build(),
48-
|pkg_mgr| {
49-
DetectResultBuilder::pass()
50-
.build_plan(
51-
BuildPlanBuilder::new()
52-
.requires("node")
53-
.requires(&pkg_mgr)
54-
.provides(pkg_mgr)
55-
.build(),
56-
)
57-
.build()
58-
},
59-
)
60-
} else {
61-
DetectResultBuilder::fail().build()
62-
}
63-
})
35+
// Corepack requires the `packageManager` key from `package.json`.
36+
// This buildpack won't be detected without it.
37+
let pkg_json_path = context.app_dir.join("package.json");
38+
if pkg_json_path.exists() {
39+
let pkg_json =
40+
PackageJson::read(pkg_json_path).map_err(CorepackBuildpackError::PackageJson)?;
41+
cfg::get_supported_package_manager(&pkg_json).map_or_else(
42+
|| DetectResultBuilder::fail().build(),
43+
|pkg_mgr| {
44+
DetectResultBuilder::pass()
45+
.build_plan(
46+
BuildPlanBuilder::new()
47+
.requires("node")
48+
.requires(&pkg_mgr)
49+
.provides(pkg_mgr)
50+
.build(),
51+
)
52+
.build()
53+
},
54+
)
55+
} else {
56+
DetectResultBuilder::fail().build()
57+
}
6458
}
6559

6660
fn build(&self, context: BuildContext<Self>) -> libcnb::Result<BuildResult, Self::Error> {
67-
let tracer = init_tracer(context.buildpack_descriptor.buildpack.id.to_string());
68-
tracer.in_span("nodejs-corepack-build", |cx| {
69-
let pkg_mgr = PackageJson::read(context.app_dir.join("package.json"))
70-
.map_err(CorepackBuildpackError::PackageJson)?
71-
.package_manager
72-
.ok_or(CorepackBuildpackError::PackageManagerMissing)?;
61+
let pkg_mgr = PackageJson::read(context.app_dir.join("package.json"))
62+
.map_err(CorepackBuildpackError::PackageJson)?
63+
.package_manager
64+
.ok_or(CorepackBuildpackError::PackageManagerMissing)?;
7365

74-
cx.span().set_attributes([
75-
KeyValue::new("package_manager.name", pkg_mgr.name.clone()),
76-
KeyValue::new("package_manager.version", pkg_mgr.version.to_string()),
77-
]);
66+
let env = &Env::from_current();
7867

79-
let env = &Env::from_current();
68+
let corepack_version =
69+
cmd::corepack_version(env).map_err(CorepackBuildpackError::CorepackVersion)?;
8070

81-
let corepack_version =
82-
cmd::corepack_version(env).map_err(CorepackBuildpackError::CorepackVersion)?;
71+
log_header(format!(
72+
"Installing {} {} via corepack {corepack_version}",
73+
pkg_mgr.name, pkg_mgr.version
74+
));
8375

84-
cx.span().set_attribute(KeyValue::new(
85-
"corepack.version",
86-
corepack_version.to_string(),
87-
));
76+
enable_corepack(&context, &corepack_version, &pkg_mgr, env)?;
77+
prepare_corepack(&context, &pkg_mgr, env)?;
8878

89-
log_header(format!(
90-
"Installing {} {} via corepack {corepack_version}",
91-
pkg_mgr.name, pkg_mgr.version
92-
));
93-
94-
enable_corepack(&context, &corepack_version, &pkg_mgr, env)?;
95-
prepare_corepack(&context, &pkg_mgr, env)?;
96-
97-
BuildResultBuilder::new().build()
98-
})
79+
BuildResultBuilder::new().build()
9980
}
10081

10182
fn on_error(&self, err: libcnb::Error<Self::Error>) {

common/nodejs-utils/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ indoc = "2"
1515
keep_a_changelog_file = "0.1.0"
1616
libcnb-data = "=0.23.0"
1717
node-semver = "2"
18-
opentelemetry = "0.24"
19-
opentelemetry_sdk = { version = "0.24", features = ["trace"] }
20-
opentelemetry-stdout = { version = "0.5", features = ["trace"] }
2118
regex = "1"
2219
serde = { version = "1", features = ['derive'] }
2320
serde_json = "1"

common/nodejs-utils/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ mod npmjs_org;
1010
pub mod package_json;
1111
pub mod package_manager;
1212
mod s3;
13-
pub mod telemetry;
1413
pub mod vrs;

common/nodejs-utils/src/telemetry.rs

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)