Skip to content

Commit 9612f5f

Browse files
RenderMichaelRenderMichael
authored
Merge branch 'trunk' into bidi-map
2 parents 83587d8 + 0461db4 commit 9612f5f

File tree

8 files changed

+54
-52
lines changed

8 files changed

+54
-52
lines changed

‎MODULE.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ maven.install(
200200
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
201201
"io.opentelemetry:opentelemetry-sdk-testing",
202202
"io.opentelemetry:opentelemetry-sdk-trace",
203-
"io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
204203
"it.ozimov:embedded-redis:0.7.3",
205204
"net.bytebuddy:byte-buddy:1.15.11",
206205
"org.htmlunit:htmlunit-core-js:4.7.0",

‎java/maven_install.json‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 1807026653,
4-
"__RESOLVED_ARTIFACTS_HASH": 978919996,
3+
"__INPUT_ARTIFACTS_HASH": -1085430726,
4+
"__RESOLVED_ARTIFACTS_HASH": 2146462613,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -324,13 +324,6 @@
324324
},
325325
"version": "4.1.118.Final"
326326
},
327-
"io.opentelemetry.semconv:opentelemetry-semconv": {
328-
"shasums": {
329-
"jar": "e8ab86e93cef09e421a6213f4cf18421fcc6e1f9cf0ab94b9a31ed4460ddf553",
330-
"sources": "b0588ae0617071c30451fe0f4916b2cde7aa8d24b542ee696a7bf59f7d7f46a8"
331-
},
332-
"version": "1.28.0-alpha"
333-
},
334327
"io.opentelemetry:opentelemetry-api": {
335328
"shasums": {
336329
"jar": "2a7658998f1da7a3730eada9c81f5005899484a1b35b8021e59884b9aaccdaf0",
@@ -1624,9 +1617,6 @@
16241617
"io.netty:netty-transport-native-unix-common": [
16251618
"io.netty.channel.unix"
16261619
],
1627-
"io.opentelemetry.semconv:opentelemetry-semconv": [
1628-
"io.opentelemetry.semconv"
1629-
],
16301620
"io.opentelemetry:opentelemetry-api": [
16311621
"io.opentelemetry.api",
16321622
"io.opentelemetry.api.baggage",
@@ -2976,8 +2966,6 @@
29762966
"io.netty:netty-transport-native-unix-common",
29772967
"io.netty:netty-transport-native-unix-common:jar:sources",
29782968
"io.netty:netty-transport:jar:sources",
2979-
"io.opentelemetry.semconv:opentelemetry-semconv",
2980-
"io.opentelemetry.semconv:opentelemetry-semconv:jar:sources",
29812969
"io.opentelemetry:opentelemetry-api",
29822970
"io.opentelemetry:opentelemetry-api-incubator",
29832971
"io.opentelemetry:opentelemetry-api-incubator:jar:sources",

‎java/src/org/openqa/selenium/remote/tracing/AttributeKey.java‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,27 @@
1717

1818
package org.openqa.selenium.remote.tracing;
1919

20-
import io.opentelemetry.semconv.SemanticAttributes;
21-
2220
public enum AttributeKey {
23-
EXCEPTION_EVENT(SemanticAttributes.EXCEPTION_EVENT_NAME),
24-
EXCEPTION_TYPE(SemanticAttributes.EXCEPTION_TYPE.getKey()),
25-
EXCEPTION_MESSAGE(SemanticAttributes.EXCEPTION_MESSAGE.getKey()),
26-
EXCEPTION_STACKTRACE(SemanticAttributes.EXCEPTION_STACKTRACE.getKey()),
21+
EXCEPTION_EVENT("exception"),
22+
EXCEPTION_TYPE("exception.type"),
23+
EXCEPTION_MESSAGE("exception.message"),
24+
EXCEPTION_STACKTRACE("exception.stacktrace"),
2725

2826
SPAN_KIND("span.kind"),
2927

30-
HTTP_METHOD(SemanticAttributes.HTTP_METHOD.getKey()),
31-
HTTP_URL(SemanticAttributes.HTTP_URL.getKey()),
32-
HTTP_STATUS_CODE(SemanticAttributes.HTTP_STATUS_CODE.getKey()),
33-
HTTP_TARGET_HOST(SemanticAttributes.HTTP_TARGET.getKey()),
28+
HTTP_METHOD("http.method"),
29+
HTTP_URL("http.url"),
30+
HTTP_STATUS_CODE("http.status_code"),
31+
HTTP_TARGET_HOST("http.target"),
3432
HTTP_CLIENT_CLASS("http.client_class"),
3533
HTTP_HANDLER_CLASS("http.handler_class"),
36-
HTTP_USER_AGENT(SemanticAttributes.HTTP_USER_AGENT.getKey()),
37-
HTTP_HOST(SemanticAttributes.HTTP_HOST.getKey()),
38-
HTTP_TARGET(SemanticAttributes.HTTP_TARGET.getKey()),
39-
HTTP_REQUEST_CONTENT_LENGTH(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH.getKey()),
40-
HTTP_CLIENT_IP(SemanticAttributes.HTTP_CLIENT_IP.getKey()),
41-
HTTP_SCHEME(SemanticAttributes.HTTP_SCHEME.getKey()),
42-
HTTP_FLAVOR(SemanticAttributes.HTTP_FLAVOR.getKey()),
34+
HTTP_USER_AGENT("http.user_agent"),
35+
HTTP_HOST("http.host"),
36+
HTTP_TARGET("http.target"),
37+
HTTP_REQUEST_CONTENT_LENGTH("http.request_content_length"),
38+
HTTP_CLIENT_IP("http.client_ip"),
39+
HTTP_SCHEME("http.scheme"),
40+
HTTP_FLAVOR("http.flavor"),
4341

4442
ERROR("error"),
4543

@@ -54,11 +52,11 @@ public enum AttributeKey {
5452
SESSION_CAPABILITIES("session.capabilities"),
5553
SESSION_URI("session.uri"),
5654

57-
DATABASE_STATEMENT(SemanticAttributes.DB_STATEMENT.getKey()),
58-
DATABASE_OPERATION(SemanticAttributes.DB_OPERATION.getKey()),
59-
DATABASE_USER(SemanticAttributes.DB_USER.getKey()),
60-
DATABASE_CONNECTION_STRING(SemanticAttributes.DB_CONNECTION_STRING.getKey()),
61-
DATABASE_SYSTEM(SemanticAttributes.DB_SYSTEM.getKey()),
55+
DATABASE_STATEMENT("db.statement"),
56+
DATABASE_OPERATION("db.operation"),
57+
DATABASE_USER("db.user"),
58+
DATABASE_CONNECTION_STRING("db.connection_string"),
59+
DATABASE_SYSTEM("db.system"),
6260

6361
REQUEST_ID("request.id");
6462

‎java/src/org/openqa/selenium/remote/tracing/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ java_library(
2828
"//java/src/org/openqa/selenium:core",
2929
"//java/src/org/openqa/selenium/remote/http",
3030
artifact("io.opentelemetry:opentelemetry-api"),
31-
artifact("io.opentelemetry.semconv:opentelemetry-semconv"),
3231
],
3332
)

‎java/src/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ java_library(
2121
artifact("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi"),
2222
artifact("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure"),
2323
artifact("io.opentelemetry:opentelemetry-sdk-trace"),
24-
artifact("io.opentelemetry.semconv:opentelemetry-semconv"),
2524
],
2625
)

‎rust/src/grid.rs‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,16 @@ impl SeleniumManager for GridManager {
106106
}
107107

108108
fn request_driver_version(&mut self) -> Result<String, Error> {
109-
let major_browser_version_binding = self.get_major_browser_version();
110-
let major_browser_version = major_browser_version_binding.as_str();
109+
let is_nightly = self.is_nightly(self.get_driver_version());
110+
let major_driver_version_binding = self.get_major_driver_version();
111+
let major_driver_version = major_driver_version_binding.as_str();
111112
let cache_path = self.get_cache_path()?;
112113
let mut metadata = get_metadata(self.get_logger(), &cache_path);
113114

114115
match get_driver_version_from_metadata(
115116
&metadata.drivers,
116117
self.driver_name,
117-
major_browser_version,
118+
major_driver_version,
118119
) {
119120
Some(driver_version) => {
120121
self.log.trace(format!(
@@ -135,8 +136,12 @@ impl SeleniumManager for GridManager {
135136
.into_iter()
136137
.filter(|r| {
137138
r.assets.iter().any(|url| {
138-
url.browser_download_url.contains(GRID_RELEASE)
139-
&& !url.browser_download_url.contains(SNAPSHOT)
139+
if is_nightly {
140+
url.browser_download_url.contains(SNAPSHOT)
141+
} else {
142+
url.browser_download_url.contains(GRID_RELEASE)
143+
&& !url.browser_download_url.contains(SNAPSHOT)
144+
}
140145
})
141146
})
142147
.collect();
@@ -155,15 +160,20 @@ impl SeleniumManager for GridManager {
155160

156161
let index_release =
157162
driver_url.rfind(GRID_RELEASE).unwrap() + GRID_RELEASE.len() + 1;
158-
let driver_version = parse_version(
159-
driver_url.as_str()[index_release..].to_string(),
160-
self.get_logger(),
161-
)?;
163+
let driver_version = if is_nightly {
164+
let index_jar = driver_url.rfind(GRID_EXTENSION).unwrap() - 1;
165+
driver_url.as_str()[index_release..index_jar].to_string()
166+
} else {
167+
parse_version(
168+
driver_url.as_str()[index_release..].to_string(),
169+
self.get_logger(),
170+
)?
171+
};
162172

163173
let driver_ttl = self.get_ttl();
164174
if driver_ttl > 0 {
165175
metadata.drivers.push(create_driver_metadata(
166-
major_browser_version,
176+
major_driver_version,
167177
self.driver_name,
168178
&driver_version,
169179
driver_ttl,

‎rust/src/lib.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,9 @@ pub trait SeleniumManager {
798798
}
799799

800800
// With the discovered browser version, discover the proper driver version using online endpoints
801-
if self.get_driver_version().is_empty() {
801+
if self.get_driver_version().is_empty()
802+
|| (self.is_grid() && self.is_nightly(self.get_driver_version()))
803+
{
802804
match self.discover_driver_version() {
803805
Ok(driver_version) => {
804806
self.set_driver_version(driver_version);
@@ -1030,7 +1032,7 @@ pub trait SeleniumManager {
10301032
}
10311033

10321034
let mut release_version = driver_version.to_string();
1033-
if !driver_version.ends_with('0') {
1035+
if !driver_version.ends_with('0') && !self.is_nightly(driver_version) {
10341036
// E.g.: version 4.8.1 is shipped within release 4.8.0
10351037
let error_message = format!(
10361038
"Wrong {} version: '{}'",

‎rust/tests/grid_tests.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use crate::common::{assert_output, get_selenium_manager, get_stdout};
2020
use exitcode::DATAERR;
2121
use rstest::rstest;
2222
use selenium_manager::logger::JsonOutput;
23+
use selenium_manager::{NIGHTLY, SNAPSHOT};
2324
use std::path::Path;
2425
use std::str;
2526

@@ -51,6 +52,7 @@ fn grid_latest_test() {
5152
#[case("4.8.0")]
5253
#[case("4.9.0")]
5354
#[case("4.10.0")]
55+
#[case("nightly")]
5456
fn grid_version_test(#[case] grid_version: &str) {
5557
let mut cmd = get_selenium_manager();
5658
cmd.args(["--grid", grid_version, "--output", "json"])
@@ -63,7 +65,12 @@ fn grid_version_test(#[case] grid_version: &str) {
6365
let json: JsonOutput = serde_json::from_str(&stdout).unwrap();
6466
let jar = Path::new(&json.result.driver_path);
6567
let jar_name = jar.file_name().unwrap().to_str().unwrap();
66-
assert!(jar_name.contains(grid_version));
68+
let version_label = if grid_version.eq_ignore_ascii_case(NIGHTLY) {
69+
SNAPSHOT
70+
} else {
71+
grid_version
72+
};
73+
assert!(jar_name.contains(version_label));
6774
}
6875

6976
#[rstest]

0 commit comments

Comments
 (0)