From d249abf5985e495c424d78cc24ea34eeb197c0f3 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 9 Jan 2025 08:47:41 +0100 Subject: [PATCH 1/2] Nit: Fix spelling of Node.js and .NET --- .gitlab-ci.yml | 4 +- CHANGELOG.md | 2 +- docs/execute/README.md | 2 +- docs/execute/binaries.md | 2 +- docs/execute/troubleshooting.md | 2 +- docs/scenarios/README.md | 4 +- docs/scenarios/k8s_lib_injection.md | 42 +++++++++---------- docs/scenarios/onboarding.md | 2 +- docs/scenarios/parametric.md | 6 +-- .../crossed_integrations/test_sqs.py | 10 ++--- .../integrations/test_db_integrations_sql.py | 2 +- tests/integrations/test_dsm.py | 6 +-- tests/integrations/utils.py | 2 +- tests/parametric/test_otel_span_methods.py | 2 +- tests/parametric/test_sampling_span_tags.py | 8 ++-- utils/_context/containers.py | 2 +- utils/build/build.sh | 4 +- utils/build/docker/nodejs/express/app.js | 2 +- .../build/docker/nodejs/parametric/server.js | 2 +- utils/scripts/load-binary.sh | 20 ++++----- 20 files changed, 63 insertions(+), 63 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87d5026957..46aff94e4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,7 +122,7 @@ variables: reports: dotenv: run.env -# ----------- Nodejs SSI ---------------- +# ----------- Node.js SSI ---------------- step1_generate_nodejs_ssi_pipeline: extends: .step1_generate_aws_ssi_pipeline needs: [] @@ -355,7 +355,7 @@ step2_exec_php_ssi_pipeline: job: x_merge_php_ssi_pipeline strategy: depend -# ----------- Dotnet SSI ---------------- +# ----------- .NET SSI ---------------- step1_generate_dotnet_ssi_pipeline: stage: dotnet_ssi_pipelines dependencies: [] diff --git a/CHANGELOG.md b/CHANGELOG.md index 07616dd049..5c7568a1ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,7 +116,7 @@ All notable changes to this project will be documented in this file. ### October 2023 (100 PR merged) * 2023-10-09 [New python/FastAPI variant](https://github.com/DataDog/system-tests/pull/1663) by @christophe-papazian -* 2023-10-27 [New NodeJS/NextJS variant](https://github.com/DataDog/system-tests/pull/1662) by @uurien +* 2023-10-27 [New Node.js/NextJS variant](https://github.com/DataDog/system-tests/pull/1662) by @uurien * 2023-10-01 [New scenario for testing debugger probes](https://github.com/DataDog/system-tests/pull/1632) by @shurivich ### September 2023 (84 PR merged) diff --git a/docs/execute/README.md b/docs/execute/README.md index 26b1ca6a0d..1347c7fce5 100644 --- a/docs/execute/README.md +++ b/docs/execute/README.md @@ -9,7 +9,7 @@ You will need a bash based terminal, python3.12, git and docker. Clone this fold ./run.sh # run tests ``` -By default, test will be executed on the nodeJS library. Please have a look on [build.sh CLI's documentation](./build.md) for more options. +By default, test will be executed on the Node.js library. Please have a look on [build.sh CLI's documentation](./build.md) for more options. `./run.sh` has [some options](./run.md), but for now, you won't need them. diff --git a/docs/execute/binaries.md b/docs/execute/binaries.md index 9816ae0fc3..a38003046d 100644 --- a/docs/execute/binaries.md +++ b/docs/execute/binaries.md @@ -81,7 +81,7 @@ Then run the OpenTelemetry drop-in test from the repo root folder: - `./build.sh java` - `TEST_LIBRARY=java ./run.sh INTEGRATIONS -k Test_Otel_Drop_In` -## NodeJS library +## Node.js library There are three ways to run system-tests with a custom node tracer. diff --git a/docs/execute/troubleshooting.md b/docs/execute/troubleshooting.md index c2006ea8ba..b466e823c0 100644 --- a/docs/execute/troubleshooting.md +++ b/docs/execute/troubleshooting.md @@ -36,7 +36,7 @@ Adjust file permissions on your `.docker`: sudo chown -R $(whoami) ~/.docker ``` -## NodeJs weblog experimenting segfaults on Mac/Intel +## Node.js weblog experimenting segfaults on Mac/Intel In the docker dashboard -> settings -> general, untick `Use Virtualization Framework`. See this [Stack overflow thread](https://stackoverflow.com/questions/76735062/segmentation-fault-in-node-js-application-running-in-docker) for more information. diff --git a/docs/scenarios/README.md b/docs/scenarios/README.md index 4a5d1b464f..c8d37588f1 100644 --- a/docs/scenarios/README.md +++ b/docs/scenarios/README.md @@ -48,10 +48,10 @@ Parametric scenarios are designed to validate tracer and span interfaces. They a ### Auto-Inject/OnBoarding scenarios -Automatic library injection simplifies the APM onboarding experience for customers deploying Java, NodeJS, .NET, Python and Ruby applications in VMs and docker environments. Datadog software installed on the machine will be intercept the startup of your application and it will inject the tracer library automatically. The OnBoarding scenarios reproduce different environments and check the library injection is done correctly. More detailled documentation can be found [here](https://github.com/DataDog/system-tests/blob/main/docs/scenarios/onboarding.md). +Automatic library injection simplifies the APM onboarding experience for customers deploying Java, Node.js, .NET, Python and Ruby applications in VMs and docker environments. Datadog software installed on the machine will be intercept the startup of your application and it will inject the tracer library automatically. The OnBoarding scenarios reproduce different environments and check the library injection is done correctly. More detailled documentation can be found [here](https://github.com/DataDog/system-tests/blob/main/docs/scenarios/onboarding.md). ### Kubernetes Auto-Inject scenarios The lib-injection project is a feature to allow injection of the Datadog library into a customer's application container without requiring them to modify their application images. -This feature enables applications written in Java, Node, Python, DotNet or Ruby running in Kubernetes to be automatically instrumented with the corresponding Datadog APM libraries. More detailled documentation can be found [here](https://github.com/DataDog/system-tests/blob/main/docs/scenarios/k8s_lib_injection.md). \ No newline at end of file +This feature enables applications written in Java, Node, Python, .NET or Ruby running in Kubernetes to be automatically instrumented with the corresponding Datadog APM libraries. More detailled documentation can be found [here](https://github.com/DataDog/system-tests/blob/main/docs/scenarios/k8s_lib_injection.md). \ No newline at end of file diff --git a/docs/scenarios/k8s_lib_injection.md b/docs/scenarios/k8s_lib_injection.md index 45ff95a514..8f8ae280e3 100644 --- a/docs/scenarios/k8s_lib_injection.md +++ b/docs/scenarios/k8s_lib_injection.md @@ -24,7 +24,7 @@ The lib-injection project is a feature to allow injection of the Datadog library into a customer's application container without requiring them to modify their application images. -This feature enables applications written in Java, Node, Python, DotNet or Ruby running +This feature enables applications written in Java, Node, Python, .NET or Ruby running in Kubernetes to be automatically instrumented with the corresponding Datadog APM libraries. @@ -64,7 +64,7 @@ These test components are also involved through the testing process: - **System-tests runner:** The core of the system-tests is the reponsible for orchestrate the tests execution and manage the tests results. - **Dev test agent:** The APM Test Agent container help us to perform the validations ([APM Test Agent](https://github.com/DataDog/dd-apm-test-agent)). -- **Sample app/weblog:** Containerized sample application implemented on Java, Nodejs, dotNet, Ruby or Python. +- **Sample app/weblog:** Containerized sample application implemented on Java, Node.js, .NET, Ruby or Python. The following image represents, in general terms, the necessary and dependent architecture to be able to run the K8s library injection tests: @@ -208,12 +208,12 @@ or if you don't have the permission to push the image to GHCR, you can use your The sample applications currently available in GHCR are: -| LANG | WEBLOG IMAGE | -|---|---| -| Java | ghcr.io/datadog/system-tests/dd-lib-java-init-test-app:latest | -| Java | ghcr.io/datadog/system-tests/dd-djm-spark-test-app:latest | -| DotNet | ghcr.io/datadog/system-tests/dd-lib-dotnet-init-test-app:latest | -| Nodejs | ghcr.io/datadog/system-tests/sample-app:latest | +| LANG | WEBLOG IMAGE | +|---------|--------------| +| Java | ghcr.io/datadog/system-tests/dd-lib-java-init-test-app:latest | +| Java | ghcr.io/datadog/system-tests/dd-djm-spark-test-app:latest | +| .NET | ghcr.io/datadog/system-tests/dd-lib-dotnet-init-test-app:latest | +| Node.js | ghcr.io/datadog/system-tests/sample-app:latest | | Python | ghcr.io/datadog/system-tests/dd-lib-python-init-test-django:latest | | Python | ghcr.io/datadog/system-tests/dd-lib-python-init-test-django-gunicorn:latest | | Python | ghcr.io/datadog/system-tests/dd-lib-python-init-test-django-gunicorn-alpine:latest | @@ -221,9 +221,9 @@ The sample applications currently available in GHCR are: | Python | ghcr.io/datadog/system-tests/dd-lib-python-init-test-django-unsupported-package-force:latest | | Python | ghcr.io/datadog/system-tests/dd-lib-python-init-test-django-uvicorn:latest | | Python | ghcr.io/datadog/system-tests/dd-lib-python-init-test-protobuf-old:latest | -| Ruby | ghcr.io/datadog/system-tests/dd-lib-ruby-init-test-rails:latest | -| Ruby | ghcr.io/datadog/system-tests/dd-lib-ruby-init-test-rails-explicit":latest | -| Ruby | ghcr.io/datadog/system-tests/dd-lib-ruby-init-test-rails-gemsrb:latest | +| Ruby | ghcr.io/datadog/system-tests/dd-lib-ruby-init-test-rails:latest | +| Ruby | ghcr.io/datadog/system-tests/dd-lib-ruby-init-test-rails-explicit":latest | +| Ruby | ghcr.io/datadog/system-tests/dd-lib-ruby-init-test-rails-gemsrb:latest | ##### Library init image @@ -233,18 +233,18 @@ The library init images are created by each tracer library and these images will The list of available images is: -| LANG | LIB INIT IMAGE | -|---|---| -| Java | gcr.io/datadoghq/dd-lib-java-init:latest | -| Java | ghcr.io/datadog/dd-trace-java/dd-lib-java-init:latest_snapshot | -| DotNet | gcr.io/datadoghq/dd-lib-dotnet-init:latest | -| DotNet | ghcr.io/datadog/dd-trace-dotnet/dd-lib-dotnet-init:latest_snapshot | -| Nodejs | gcr.io/datadoghq/dd-lib-js-init:latest | -| Nodejs | ghcr.io/datadog/dd-trace-js/dd-lib-js-init:latest_snapshot | +| LANG | LIB INIT IMAGE | +|---------|----------------| +| Java | gcr.io/datadoghq/dd-lib-java-init:latest | +| Java | ghcr.io/datadog/dd-trace-java/dd-lib-java-init:latest_snapshot | +| .NET | gcr.io/datadoghq/dd-lib-dotnet-init:latest | +| .NET | ghcr.io/datadog/dd-trace-dotnet/dd-lib-dotnet-init:latest_snapshot | +| Node.js | gcr.io/datadoghq/dd-lib-js-init:latest | +| Node.js | ghcr.io/datadog/dd-trace-js/dd-lib-js-init:latest_snapshot | | Python | gcr.io/datadoghq/dd-lib-python-init:latest | | Python | ghcr.io/datadog/dd-trace-py/dd-lib-python-init:latest_snapshot | -| Ruby | gcr.io/datadoghq/dd-lib-ruby-init:latest | -| Ruby | ghcr.io/datadog/dd-trace-rb/dd-lib-ruby-init:latest_snapshot | +| Ruby | gcr.io/datadoghq/dd-lib-ruby-init:latest | +| Ruby | ghcr.io/datadog/dd-trace-rb/dd-lib-ruby-init:latest_snapshot | ##### Datadog Cluster Agent diff --git a/docs/scenarios/onboarding.md b/docs/scenarios/onboarding.md index 682d3fcf99..e5e5f717e3 100644 --- a/docs/scenarios/onboarding.md +++ b/docs/scenarios/onboarding.md @@ -23,7 +23,7 @@ # Overall -Similarly to Library Injection in Kubernetes environments via the admission controller, Library injection simplifies the APM onboarding experience for customers auto-intrumenting Java, Python, NodeJS, .NET, PHP or Ruby applications running on host or in docker environments. +Similarly to Library Injection in Kubernetes environments via the admission controller, Library injection simplifies the APM onboarding experience for customers auto-intrumenting Java, Python, Node.js, .NET, PHP or Ruby applications running on host or in docker environments. The target of this testing feature is to test the distinct injection environments. diff --git a/docs/scenarios/parametric.md b/docs/scenarios/parametric.md index 6d1eb733a2..35d75c5898 100644 --- a/docs/scenarios/parametric.md +++ b/docs/scenarios/parametric.md @@ -232,11 +232,11 @@ The http server implementations for each tracer can be found at the following lo * [Python](/utils/build/docker/python/parametric/apm_test_client/server.py) * [Ruby](/utils/build/docker/ruby/parametric/server.rb) * [Php](/utils/build/docker/php/parametric/server.php) -* [Nodejs](/utils/build/docker/nodejs/parametric/server.js) +* [Node.js](/utils/build/docker/nodejs/parametric/server.js) * [Java Datadog](/utils/build/docker/java/parametric/src/main/java/com/datadoghq/trace/opentracing/controller/OpenTracingController.java) * [Java Otel](/utils/build/docker/java/parametric/src/main/java/com/datadoghq/trace/opentelemetry/controller/OpenTelemetryController.java) -* [Dotnet Datadog](/utils/build/docker/dotnet/parametric/Endpoints/ApmTestApi.cs) -* [Dotnet Otel](/utils/build/docker/dotnet/parametric/Endpoints/ApmTestApiOtel.cs) +* [.NET Datadog](/utils/build/docker/dotnet/parametric/Endpoints/ApmTestApi.cs) +* [.NET Otel](/utils/build/docker/dotnet/parametric/Endpoints/ApmTestApiOtel.cs) * [Go Datadog](/utils/build/docker/golang/parametric/main.go) * [Go Otel](/utils/build/docker/golang/parametric/otel.go) diff --git a/tests/integrations/crossed_integrations/test_sqs.py b/tests/integrations/crossed_integrations/test_sqs.py index 3d73af3706..feda54396d 100644 --- a/tests/integrations/crossed_integrations/test_sqs.py +++ b/tests/integrations/crossed_integrations/test_sqs.py @@ -125,7 +125,7 @@ def test_produce(self): @missing_feature(library="ruby", reason="Expected to fail, Ruby does not propagate context") @missing_feature( library="java", - reason="Expected to fail, Dotnet does not propagate context via msg attrs or uses xray which also doesn't work", + reason="Expected to fail, .NET does not propagate context via msg attrs or uses xray which also doesn't work", ) def test_produce_trace_equality(self): """This test relies on the setup for produce, it currently cannot be run on its own""" @@ -190,7 +190,7 @@ def test_consume(self): @missing_feature(library="golang", reason="Expected to fail, Golang does not propagate context") @missing_feature(library="ruby", reason="Expected to fail, Ruby does not propagate context") - @missing_feature(library="dotnet", reason="Expected to fail, Dotnet does not propagate context") + @missing_feature(library="dotnet", reason="Expected to fail, .NET does not propagate context") def test_consume_trace_equality(self): """This test relies on the setup for consume, it currently cannot be run on its own""" producer_span = self.get_span( @@ -261,7 +261,7 @@ class Test_SQS_PROPAGATION_VIA_AWS_XRAY_HEADERS(_Test_SQS): @missing_feature( library="nodejs", - reason="Expected to fail, NodeJS will not create a response span \ + reason="Expected to fail, Node.js will not create a response span \ propagating context since it cannot extract AWSTracerHeader context that Java injects", ) def test_consume(self): @@ -275,7 +275,7 @@ def test_produce_trace_equality(self): @missing_feature(library="golang", reason="Expected to fail, Golang does not propagate context") @missing_feature(library="ruby", reason="Expected to fail, Ruby does not propagate context") @missing_feature(library="python", reason="Expected to fail, Python does not propagate context") - @missing_feature(library="nodejs", reason="Expected to fail, Nodejs does not propagate context") - @missing_feature(library="dotnet", reason="Expected to fail, Dotnet will not extract from XRay headers") + @missing_feature(library="nodejs", reason="Expected to fail, Node.js does not propagate context") + @missing_feature(library="dotnet", reason="Expected to fail, .NET will not extract from XRay headers") def test_consume_trace_equality(self): super().test_consume_trace_equality() diff --git a/tests/integrations/test_db_integrations_sql.py b/tests/integrations/test_db_integrations_sql.py index afab384db4..8cf6aa748e 100644 --- a/tests/integrations/test_db_integrations_sql.py +++ b/tests/integrations/test_db_integrations_sql.py @@ -294,7 +294,7 @@ def test_obfuscate_query(self, excluded_operations=()): expected_obfuscation_count = 1 elif db_operation == "procedure": # Insert and procedure:These operations also receive two parameters, but are obfuscated as only one. - # Nodejs: The proccedure has a input parameter, but we are calling through method `execute`` and we can't see the parameters in the traces + # Node.js: The proccedure has a input parameter, but we are calling through method `execute`` and we can't see the parameters in the traces expected_obfuscation_count = 0 if context.library.library == "nodejs" else 2 else: expected_obfuscation_count = 2 diff --git a/tests/integrations/test_dsm.py b/tests/integrations/test_dsm.py index 02fa67e96b..49e94badd1 100644 --- a/tests/integrations/test_dsm.py +++ b/tests/integrations/test_dsm.py @@ -170,7 +170,7 @@ def setup_dsm_rabbitmq_dotnet_legacy(self): def test_dsm_rabbitmq_dotnet_legacy(self): assert self.r.text == "ok" - # Dotnet sets the tag for `has_routing_key` to `has_routing_key:True` instead of `has_routing_key:true` like + # .NET sets the tag for `has_routing_key` to `has_routing_key:True` instead of `has_routing_key:true` like # the other tracer libraries, which causes the resulting hash to be different. DsmHelper.assert_checkpoint_presence( hash_=12547013883960139159, @@ -529,7 +529,7 @@ def setup_dsm_manual_checkpoint_intra_process(self): timeout=DSM_REQUEST_TIMEOUT, ) - @irrelevant(library="nodejs", reason="NodeJS doesn't sort the DSM edge tags and has different hashes.") + @irrelevant(library="nodejs", reason="Node.js doesn't sort the DSM edge tags and has different hashes.") def test_dsm_manual_checkpoint_intra_process(self): assert self.produce.status_code == 200 assert self.produce.text == "ok" @@ -602,7 +602,7 @@ def setup_dsm_manual_checkpoint_inter_process(self): timeout=DSM_REQUEST_TIMEOUT, ) - @irrelevant(library="nodejs", reason="NodeJS doesn't sort the DSM edge tags and has different hashes.") + @irrelevant(library="nodejs", reason="Node.js doesn't sort the DSM edge tags and has different hashes.") def test_dsm_manual_checkpoint_inter_process(self): assert self.produce_threaded.status_code == 200 assert self.produce_threaded.text == "ok" diff --git a/tests/integrations/utils.py b/tests/integrations/utils.py index 5bd770692f..444b344002 100644 --- a/tests/integrations/utils.py +++ b/tests/integrations/utils.py @@ -45,7 +45,7 @@ def _setup(self): "/db", params={"service": self.db_service, "operation": db_operation} ) if self.db_service == "mssql": - # Nodejs opentelemetry-instrumentation-mssql is too old and select query is not tracer allways + # Node.js opentelemetry-instrumentation-mssql is too old and select query is not tracer allways # see https://github.com/mnadeem/opentelemetry-instrumentation-mssql # Retry to avoid flakyness logger.debug("Retry select query for mssql .....") diff --git a/tests/parametric/test_otel_span_methods.py b/tests/parametric/test_otel_span_methods.py index ec3f392d77..1c4435f3a3 100644 --- a/tests/parametric/test_otel_span_methods.py +++ b/tests/parametric/test_otel_span_methods.py @@ -429,7 +429,7 @@ def test_otel_get_span_context(self, test_agent, test_library): # Some languages e.g. PHP return a hexadecimal span id assert context.get("span_id") == span.span_id else: - # Some languages e.g. Nodejs using express need to return as a string value + # Some languages e.g. Node.js using express need to return as a string value # due to 64-bit integers being too large. assert context.get("span_id") == "{:016x}".format(int(span.span_id)) assert context.get("trace_flags") == "01" diff --git a/tests/parametric/test_sampling_span_tags.py b/tests/parametric/test_sampling_span_tags.py index 1169511bb7..d08c0b4952 100644 --- a/tests/parametric/test_sampling_span_tags.py +++ b/tests/parametric/test_sampling_span_tags.py @@ -73,7 +73,7 @@ def _assert_sampling_tags( @features.trace_sampling class Test_Sampling_Span_Tags: @bug(library="python", reason="APMAPI-737") # Python sets dm tag on child span - @bug(library="nodejs", reason="APMAPI-737") # NodeJS does not set priority on parent span + @bug(library="nodejs", reason="APMAPI-737") # Node.js does not set priority on parent span @bug(library="ruby", reason="APMAPI-737") # ruby does not set dm tag on first span @bug(library="dotnet", reason="APMAPI-737") # dotnet does not set dm tag on first span @bug(library="golang", reason="APMAPI-737") # golang sets priority 2 @@ -159,8 +159,8 @@ def test_tags_defaults_rate_1_sst003(self, test_agent, test_library): ) @bug(library="java", reason="APMAPI-737") # Java sets rate tag 9.9999 on parent span - @bug(library="dotnet", reason="APMAPI-737") # Dotnet sets rate tag 9.9999 on parent span - @bug(library="nodejs", reason="APMAPI-737") # NodeJS does not set dm tag on first span + @bug(library="dotnet", reason="APMAPI-737") # .NET sets rate tag 9.9999 on parent span + @bug(library="nodejs", reason="APMAPI-737") # Node.js does not set dm tag on first span @bug(library="golang", reason="APMAPI-737") # golang does not set dm tag on first span @bug(library="python", reason="APMAPI-737") # python does not set dm tag on first span @bug(library="ruby", reason="APMAPI-737") # ruby does not set dm tag on first span @@ -206,7 +206,7 @@ def test_tags_defaults_rate_1_and_rule_1_sst005(self, test_agent, test_library): "be set to the given rule rate, which is 1", ) - @bug(library="nodejs", reason="APMAPI-737") # NodeJS does not set dm tag on first span + @bug(library="nodejs", reason="APMAPI-737") # Node.js does not set dm tag on first span @bug(library="php", reason="APMAPI-737") # php does not set dm tag on first span @bug(library="ruby", reason="APMAPI-737") # ruby does not set dm tag on first span @bug(library="python", reason="APMAPI-737") # python does not set dm tag on first span diff --git a/utils/_context/containers.py b/utils/_context/containers.py index 1f7d9a1c50..76ff3cbc91 100644 --- a/utils/_context/containers.py +++ b/utils/_context/containers.py @@ -1129,7 +1129,7 @@ def __init__(self, host_log_folder, name) -> None: def _lib_init_image(self, lib_init_image): self.image = ImageInfo(lib_init_image, local_image_only=False) - # Dotnet compatible with former folder layer + # .NET compatible with former folder layer if "dd-lib-dotnet-init" in lib_init_image: self.kwargs["volumes"] = { _VOLUME_INJECTOR_NAME: {"bind": "/datadog-init/monitoring-home", "mode": "rw"}, diff --git a/utils/build/build.sh b/utils/build/build.sh index 06f9d75160..86ee5c3d66 100755 --- a/utils/build/build.sh +++ b/utils/build/build.sh @@ -71,9 +71,9 @@ print_usage() { echo -e " ${SCRIPT_NAME}" echo -e " Build images for Java and Spring Boot:" echo -e " ${SCRIPT_NAME} --library java --weblog-variant spring-boot" - echo -e " Build default images for Dotnet with binary path:" + echo -e " Build default images for .NET with binary path:" echo -e " ${SCRIPT_NAME} dotnet --binary-path "/mnt/c/dev/dd-trace-dotnet-linux/tmp/linux-x64"" - echo -e " Build default images for Dotnet with binary url:" + echo -e " Build default images for .NET with binary url:" echo -e " ${SCRIPT_NAME} ./build.sh dotnet --binary-url "https://github.com/DataDog/dd-trace-dotnet/releases/download/v2.27.0/datadog-dotnet-apm-2.27.0.tar.gz"" echo -e " List libraries:" echo -e " ${SCRIPT_NAME} --list-libraries" diff --git a/utils/build/docker/nodejs/express/app.js b/utils/build/docker/nodejs/express/app.js index c294838692..cbf483b367 100644 --- a/utils/build/docker/nodejs/express/app.js +++ b/utils/build/docker/nodejs/express/app.js @@ -337,7 +337,7 @@ app.get('/rabbitmq/produce', (req, res) => { const routingKey = 'systemTestDirectRoutingKeyContextPropagation' console.log('[RabbitMQ] produce') - rabbitmqProduce(queue, exchange, routingKey, 'NodeJS Produce Context Propagation Test RabbitMQ') + rabbitmqProduce(queue, exchange, routingKey, 'Node.js Produce Context Propagation Test RabbitMQ') .then(() => { res.status(200).send('[RabbitMQ] produce ok') }) diff --git a/utils/build/docker/nodejs/parametric/server.js b/utils/build/docker/nodejs/parametric/server.js index 4f46d65b3e..e55b18fe7a 100644 --- a/utils/build/docker/nodejs/parametric/server.js +++ b/utils/build/docker/nodejs/parametric/server.js @@ -165,7 +165,7 @@ app.post('/trace/span/set_metric', (req, res) => { }); app.post('/trace/stats/flush', (req, res) => { - // TODO: implement once available in NodeJS Tracer + // TODO: implement once available in Node.js Tracer res.json({}); }); diff --git a/utils/scripts/load-binary.sh b/utils/scripts/load-binary.sh index 743f23bb54..e9acd68826 100755 --- a/utils/scripts/load-binary.sh +++ b/utils/scripts/load-binary.sh @@ -10,16 +10,16 @@ # # Binaries sources: # -# * Agent: Docker hub datadog/agent-dev:master-py3 -# * Golang: gopkg.in/DataDog/dd-trace-go.v1@main -# * .NET: ghcr.io/datadog/dd-trace-dotnet -# * Java: ghcr.io/datadog/dd-trace-java -# * PHP: ghcr.io/datadog/dd-trace-php -# * NodeJS: Direct from github source -# * C++: Direct from github source -# * Python: Direct from github source -# * Ruby: Direct from github source -# * WAF: Direct from github source, but not working, as this repo is now private +# * Agent: Docker hub datadog/agent-dev:master-py3 +# * Golang: gopkg.in/DataDog/dd-trace-go.v1@main +# * .NET: ghcr.io/datadog/dd-trace-dotnet +# * Java: ghcr.io/datadog/dd-trace-java +# * PHP: ghcr.io/datadog/dd-trace-php +# * Node.js: Direct from github source +# * C++: Direct from github source +# * Python: Direct from github source +# * Ruby: Direct from github source +# * WAF: Direct from github source, but not working, as this repo is now private ########################################################################################## set -eu From cb6f36e3d9305027cf8405a76aa81e7086b66792 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 9 Jan 2025 12:16:36 +0100 Subject: [PATCH 2/2] Rename 'Node' to 'Node.js' in a few places --- CHANGELOG.md | 2 +- docs/scenarios/README.md | 2 +- docs/scenarios/k8s_lib_injection.md | 2 +- lib-injection/README.md | 4 ++-- tests/parametric/test_otel_env_vars.py | 2 +- tests/test_config_consistency.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c7568a1ac..66e51a2488 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,7 +64,7 @@ All notable changes to this project will be documented in this file. * 2024-05-27 [Use semver for version parser](https://github.com/DataDog/system-tests/pull/2487) by @cbeauchesne * 2024-05-07 [[python] decrease the waiting time for python libraries from 25s to 5s](https://github.com/DataDog/system-tests/pull/2431) by @christophe-papazian -* 2024-05-29 [Manifest references + Node semver migration](https://github.com/DataDog/system-tests/pull/2416) by @simon-id +* 2024-05-29 [Manifest references + Node.js semver migration](https://github.com/DataDog/system-tests/pull/2416) by @simon-id * 2024-05-03 [Dynamically compute scenarios to run](https://github.com/DataDog/system-tests/pull/2408) by @cbeauchesne diff --git a/docs/scenarios/README.md b/docs/scenarios/README.md index c8d37588f1..61f036f5e9 100644 --- a/docs/scenarios/README.md +++ b/docs/scenarios/README.md @@ -54,4 +54,4 @@ Automatic library injection simplifies the APM onboarding experience for custome The lib-injection project is a feature to allow injection of the Datadog library into a customer's application container without requiring them to modify their application images. -This feature enables applications written in Java, Node, Python, .NET or Ruby running in Kubernetes to be automatically instrumented with the corresponding Datadog APM libraries. More detailled documentation can be found [here](https://github.com/DataDog/system-tests/blob/main/docs/scenarios/k8s_lib_injection.md). \ No newline at end of file +This feature enables applications written in Java, Node.js, Python, .NET or Ruby running in Kubernetes to be automatically instrumented with the corresponding Datadog APM libraries. More detailled documentation can be found [here](https://github.com/DataDog/system-tests/blob/main/docs/scenarios/k8s_lib_injection.md). \ No newline at end of file diff --git a/docs/scenarios/k8s_lib_injection.md b/docs/scenarios/k8s_lib_injection.md index 8f8ae280e3..080281dbbb 100644 --- a/docs/scenarios/k8s_lib_injection.md +++ b/docs/scenarios/k8s_lib_injection.md @@ -24,7 +24,7 @@ The lib-injection project is a feature to allow injection of the Datadog library into a customer's application container without requiring them to modify their application images. -This feature enables applications written in Java, Node, Python, .NET or Ruby running +This feature enables applications written in Java, Node.js, Python, .NET or Ruby running in Kubernetes to be automatically instrumented with the corresponding Datadog APM libraries. diff --git a/lib-injection/README.md b/lib-injection/README.md index 529924279d..25ba180dca 100644 --- a/lib-injection/README.md +++ b/lib-injection/README.md @@ -6,7 +6,7 @@ The lib-injection project is a feature to allow injection of the Datadog library into a customer's application container without requiring them to modify their application images. -This feature enables applications written in Java, Node or Python running +This feature enables applications written in Java, Node.js or Python running in Kubernetes to be automatically instrumented with the corresponding Datadog APM libraries. @@ -43,7 +43,7 @@ The Datadog admission controller is a component of the Datadog Cluster Agent. It Lib injection testing is part of the "system-tests" test suite. Although we run it in isolation from the system-tests, they share certain similarities -To test lib-injection/autoinstrumentation feature, we run a Kubernetes cluster with the Datadog Cluster Agent and we check that the instrumentation runs smoothly using different sample applications (weblog) in different languages (currently Java, Python and Node). +To test lib-injection/autoinstrumentation feature, we run a Kubernetes cluster with the Datadog Cluster Agent and we check that the instrumentation runs smoothly using different sample applications (weblog) in different languages (currently Java, Python and Node.js). The following image represents, in general terms, the necessary and dependent architecture to be able to run lib-injection tests: diff --git a/tests/parametric/test_otel_env_vars.py b/tests/parametric/test_otel_env_vars.py index 93687cd59e..e0a30671b2 100644 --- a/tests/parametric/test_otel_env_vars.py +++ b/tests/parametric/test_otel_env_vars.py @@ -11,7 +11,7 @@ class Test_Otel_Env_Vars: { "DD_SERVICE": "service", "OTEL_SERVICE_NAME": "otel_service", - "DD_TRACE_LOG_LEVEL": "error", # Node uses DD_TRACE_LOG_LEVEL + "DD_TRACE_LOG_LEVEL": "error", # Node.js uses DD_TRACE_LOG_LEVEL "DD_LOG_LEVEL": "error", "DD_TRACE_DEBUG": "false", "OTEL_LOG_LEVEL": "debug", diff --git a/tests/test_config_consistency.py b/tests/test_config_consistency.py index 3a968fd232..f18e218ab4 100644 --- a/tests/test_config_consistency.py +++ b/tests/test_config_consistency.py @@ -84,7 +84,7 @@ def setup_query_string_obfuscation_empty_client(self): self.r = weblog.get("/make_distant_call", params={"url": "http://weblog:7777/?key=monkey"}) @bug(context.library == "java", reason="APMAPI-770") - @missing_feature(context.library == "nodejs", reason="Node only obfuscates queries on the server side") + @missing_feature(context.library == "nodejs", reason="Node.js only obfuscates queries on the server side") @missing_feature(context.library == "golang", reason="Go only obfuscates queries on the server side") def test_query_string_obfuscation_empty_client(self): spans = [s for _, _, s in interfaces.library.get_spans(request=self.r, full_trace=True)]