[golang] new orchestrion go weblog

.github/workflows/ci.yml

@@ -157,7 +157,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
     - system_tests
-    if: always()
+    if: '!cancelled()'
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5

docs/execute/binaries.md

@@ -34,6 +34,12 @@ Create a file `golang-load-from-go-get` under the `binaries` directory that spec
     * `gopkg.in/DataDog/[email protected]` Test the 1.67.0 release
     * `gopkg.in/DataDog/dd-trace-go.v1@<commit_hash>` Test un-merged changes
 
+To change Orchestrion version, create a file `orchestrion-load-from-go-get` under the `binaries` directory that specifies the target build. The content of this file will be installed by the weblog or parametric app via `go get` when the test image is built.
+* Content example:
+    * `github.com/DataDog/orchestrion@main` Test the main branch
+    * `github.com/DataDog/[email protected]` Test the 1.1.0 release
+    * `github.com/DataDog/orchestrion@<commit_hash>` Test un-merged changes
+
 ## Java library
 
 Follow these steps to run Parametric tests with a custom Java Tracer version:

manifests/golang.yml

@@ -22,6 +22,7 @@ tests/:
         Test_API_Security_Sampling_Rate:
           '*': v1.60.0
           net-http: irrelevant (net-http doesn't handle path params)
+          net-http-orchestrion: irrelevant (net-http doesn't handle path params)
         Test_API_Security_Sampling_With_Delay: missing_feature
       test_schemas.py:
         Test_Scanners: missing_feature
@@ -32,6 +33,7 @@ tests/:
         Test_Schema_Request_Path_Parameters:
           '*': v1.60.0
           net-http: irrelevant (net-http cannot list path params)
+          net-http-orchestrion: irrelevant (net-http cannot list path params)
         Test_Schema_Request_Query_Parameters: v1.60.0
         Test_Schema_Response_Body: missing_feature
         Test_Schema_Response_Body_env_var: missing_feature
@@ -217,6 +219,7 @@ tests/:
           '*': v1.36.0
           gin: v1.37.0
           net-http: irrelevant (net-http doesn't handle path params)
+          net-http-orchestrion: irrelevant (net-http doesn't handle path params)
         Test_ResponseStatus:
           '*': v1.36.0
           gin: v1.37.0
@@ -337,21 +340,27 @@ tests/:
       Test_Blocking_request_cookies:
         '*': v1.51.0
         net-http: irrelevant
+        net-http-orchestrion: irrelevant
       Test_Blocking_request_headers:
         '*': v1.51.0
         net-http: irrelevant
+        net-http-orchestrion: irrelevant
       Test_Blocking_request_method:
         '*': v1.51.0
         net-http: irrelevant
+        net-http-orchestrion: irrelevant
       Test_Blocking_request_path_params:
         '*': v1.51.0
         net-http: irrelevant
+        net-http-orchestrion: irrelevant
       Test_Blocking_request_query:
         '*': v1.51.0
         net-http: irrelevant
+        net-http-orchestrion: irrelevant
       Test_Blocking_request_uri:
         '*': v1.51.0
         net-http: irrelevant
+        net-http-orchestrion: irrelevant
       Test_Blocking_response_headers: missing_feature
       Test_Blocking_response_status: missing_feature
       Test_Blocking_user_id: v1.51.0
@@ -457,21 +466,26 @@ tests/:
         Test_Kinesis_PROPAGATION_VIA_MESSAGE_ATTRIBUTES:
           "*": irrelevant
           net-http: missing_feature (Endpoint not implemented)
+          net-http-orchestrion: missing_feature (Endpoint not implemented)
       test_rabbitmq.py:
         Test_RabbitMQ_Trace_Context_Propagation:
           "*": irrelevant
           net-http: missing_feature (Endpoint not implemented)
+          net-http-orchestrion: missing_feature (Endpoint not implemented)
       test_sns_to_sqs.py:
         Test_SNS_Propagation:
           "*": irrelevant
           net-http: missing_feature
+          net-http-orchestrion: missing_feature (Endpoint not implemented)
       test_sqs.py:
         Test_SQS_PROPAGATION_VIA_AWS_XRAY_HEADERS:
           "*": irrelevant
           net-http: missing_feature (Endpoint not implemented)
+          net-http-orchestrion: missing_feature (Endpoint not implemented)
         Test_SQS_PROPAGATION_VIA_MESSAGE_ATTRIBUTES:
           "*": irrelevant
           net-http: missing_feature (Endpoint not implemented)
+          net-http-orchestrion: missing_feature (Endpoint not implemented)
     test_db_integrations_sql.py:
       Test_MsSql: missing_feature
       Test_MySql: missing_feature
@@ -492,27 +506,35 @@ tests/:
       Test_DsmKinesis:
         "*": irrelevant
         net-http: missing_feature (Endpoint not implemented)
+        net-http-orchestrion: missing_feature (Endpoint not implemented)
       Test_DsmRabbitmq:
         "*": irrelevant
         net-http: missing_feature (Endpoint not implemented)
+        net-http-orchestrion: missing_feature (Endpoint not implemented)
       Test_DsmRabbitmq_FanoutExchange:
         "*": irrelevant
         net-http: missing_feature (Endpoint not implemented)
+        net-http-orchestrion: missing_feature (Endpoint not implemented)
       Test_DsmRabbitmq_TopicExchange:
         "*": irrelevant
         net-http: missing_feature (Endpoint not implemented)
+        net-http-orchestrion: missing_feature (Endpoint not implemented)
       Test_DsmSNS:
         "*": irrelevant
         net-http: missing_feature (Endpoint not implemented)
+        net-http-orchestrion: missing_feature (Endpoint not implemented)
       Test_DsmSQS:
         "*": irrelevant
         net-http: missing_feature (Endpoint not implemented)
+        net-http-orchestrion: missing_feature (Endpoint not implemented)
       Test_Dsm_Manual_Checkpoint_Inter_Process:
         "*": irrelevant
         net-http: missing_feature (Endpoint not implemented)
+        net-http-orchestrion: missing_feature (Endpoint not implemented)
       Test_Dsm_Manual_Checkpoint_Intra_Process:
         "*": irrelevant
         net-http: missing_feature (Endpoint not implemented)
+        net-http-orchestrion: missing_feature (Endpoint not implemented)
     test_inferred_proxy.py:
       Test_AWS_API_Gateway_Inferred_Span_Creation: missing_feature
     test_otel_drop_in.py:
@@ -592,7 +614,9 @@ tests/:
     Test_Config_ClientTagQueryString_Configured: v1.72.0-dev
     Test_Config_ClientTagQueryString_Empty: v1.72.0-dev
     Test_Config_HttpClientErrorStatuses_Default: v1.69.0
-    Test_Config_HttpClientErrorStatuses_FeatureFlagCustom: v1.69.0
+    Test_Config_HttpClientErrorStatuses_FeatureFlagCustom:
+      '*': v1.69.0
+      net-http-orchestrion: v1.72.0-dev
     Test_Config_HttpServerErrorStatuses_Default: v1.67.0
     Test_Config_HttpServerErrorStatuses_FeatureFlagCustom:
       "*": v1.69.0

tests/test_semantic_conventions.py

@@ -36,6 +36,7 @@
     "graphql-go": "graphql-go/graphql",
     "jersey-grizzly2": {"jakarta-rs.request": "jakarta-rs-controller", "grizzly.request": ["grizzly", "jakarta-rs"]},
     "net-http": "net/http",
+    "net-http-orchestrion": "net/http",
     "sinatra": {"rack.request": "rack"},
     "spring-boot": {
         "servlet.request": "tomcat-server",

tests/test_standard_tags.py

@@ -209,7 +209,7 @@ def test_route(self):
         if context.library == "nodejs":
             tags["http.route"] = "/sample_rate_route/:i"
         if context.library == "golang":
-            if context.weblog_variant == "net-http":
+            if "net-http" in context.weblog_variant:
                 # net/http doesn't support parametrized routes but a path catches anything down the tree.
                 tags["http.route"] = "/sample_rate_route/"
             if context.weblog_variant in ("gin", "echo", "uds-echo"):

utils/build/docker/golang/app/internal/common/http_client_default.go

@@ -0,0 +1,18 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2024 Datadog, Inc.
+
+//go:build !orchestrion
+
+package common
+
+import (
+	"net/http"
+
+	httptrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/net/http"
+)
+
+func httpClient() *http.Client {
+	return httptrace.WrapClient(http.DefaultClient, httptrace.RTWithPropagation(true))
+}

utils/build/docker/golang/app/internal/common/http_client_orchestrion.go

@@ -0,0 +1,16 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2024 Datadog, Inc.
+
+//go:build orchestrion
+
+package common
+
+import (
+	"net/http"
+)
+
+func httpClient() *http.Client {
+	return http.DefaultClient
+}

utils/build/docker/golang/app/internal/common/standalone_asm.go

@@ -11,12 +11,10 @@ import (
 	"log"
 	"net/http"
 	"strings"
-
-	httptrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/net/http"
 )
 
 func Requestdownstream(w http.ResponseWriter, r *http.Request) {
-	client := httptrace.WrapClient(http.DefaultClient, httptrace.RTWithPropagation(true))
+	client := httpClient()
 	req, _ := http.NewRequest(http.MethodGet, "http://127.0.0.1:7777/returnheaders", nil)
 	req = req.WithContext(r.Context())
 	res, err := client.Do(req)