From 7b15530b0de93668bbdae3d3069f815b55e5fe65 Mon Sep 17 00:00:00 2001 From: Avadhut Pisal Date: Sat, 8 Oct 2022 17:00:07 +0530 Subject: [PATCH 1/2] changes app image and context propagator b3 to b3multi --- .../00-install-instrumentation.yaml | 2 +- .../e2e/instrumentation-dotnet-multicontainer/01-assert.yaml | 4 ++-- .../instrumentation-dotnet-multicontainer/01-install-app.yaml | 2 +- .../e2e/instrumentation-dotnet-multicontainer/02-assert.yaml | 2 +- .../instrumentation-dotnet-multicontainer/02-install-app.yaml | 2 +- .../instrumentation-dotnet/00-install-instrumentation.yaml | 2 +- tests/e2e/instrumentation-dotnet/01-assert.yaml | 2 +- tests/e2e/instrumentation-dotnet/01-install-app.yaml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/00-install-instrumentation.yaml b/tests/e2e/instrumentation-dotnet-multicontainer/00-install-instrumentation.yaml index 391b502dfa..71351ee432 100644 --- a/tests/e2e/instrumentation-dotnet-multicontainer/00-install-instrumentation.yaml +++ b/tests/e2e/instrumentation-dotnet-multicontainer/00-install-instrumentation.yaml @@ -20,7 +20,7 @@ spec: endpoint: http://localhost:4317 propagators: - jaeger - - b3 + - b3multi sampler: type: parentbased_traceidratio argument: "0.25" diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/01-assert.yaml b/tests/e2e/instrumentation-dotnet-multicontainer/01-assert.yaml index c2ed9a8886..48dc57916c 100644 --- a/tests/e2e/instrumentation-dotnet-multicontainer/01-assert.yaml +++ b/tests/e2e/instrumentation-dotnet-multicontainer/01-assert.yaml @@ -44,7 +44,7 @@ spec: - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME - name: OTEL_PROPAGATORS - value: jaeger,b3 + value: jaeger,b3multi - name: OTEL_RESOURCE_ATTRIBUTES volumeMounts: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount @@ -85,7 +85,7 @@ spec: - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME - name: OTEL_PROPAGATORS - value: jaeger,b3 + value: jaeger,b3multi - name: OTEL_RESOURCE_ATTRIBUTES volumeMounts: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml b/tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml index ce6889a699..923b2764c3 100644 --- a/tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml +++ b/tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml @@ -18,6 +18,6 @@ spec: spec: containers: - name: myapp - image: docker.io/adib070/mvc + image: docker.io/avadhutp123/aspnetapp:latest - name: myrabbit image: rabbitmq diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/02-assert.yaml b/tests/e2e/instrumentation-dotnet-multicontainer/02-assert.yaml index fdb39b7c1a..ff8be2ac3d 100644 --- a/tests/e2e/instrumentation-dotnet-multicontainer/02-assert.yaml +++ b/tests/e2e/instrumentation-dotnet-multicontainer/02-assert.yaml @@ -47,7 +47,7 @@ spec: - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME - name: OTEL_PROPAGATORS - value: jaeger,b3 + value: jaeger,b3multi - name: OTEL_RESOURCE_ATTRIBUTES volumeMounts: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml b/tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml index 137023368c..311a8f75de 100644 --- a/tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml +++ b/tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml @@ -18,6 +18,6 @@ spec: spec: containers: - name: myapp - image: docker.io/adib070/mvc + image: docker.io/avadhutp123/aspnetapp:latest - name: myrabbit image: rabbitmq diff --git a/tests/e2e/instrumentation-dotnet/00-install-instrumentation.yaml b/tests/e2e/instrumentation-dotnet/00-install-instrumentation.yaml index fb267ba1e5..80ca25ca55 100644 --- a/tests/e2e/instrumentation-dotnet/00-install-instrumentation.yaml +++ b/tests/e2e/instrumentation-dotnet/00-install-instrumentation.yaml @@ -20,7 +20,7 @@ spec: endpoint: http://localhost:4317 propagators: - jaeger - - b3 + - b3multi sampler: type: parentbased_traceidratio argument: "0.25" diff --git a/tests/e2e/instrumentation-dotnet/01-assert.yaml b/tests/e2e/instrumentation-dotnet/01-assert.yaml index 28b3a289fd..29bbb3a6fe 100644 --- a/tests/e2e/instrumentation-dotnet/01-assert.yaml +++ b/tests/e2e/instrumentation-dotnet/01-assert.yaml @@ -41,7 +41,7 @@ spec: - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME - name: OTEL_PROPAGATORS - value: jaeger,b3 + value: jaeger,b3multi - name: OTEL_RESOURCE_ATTRIBUTES volumeMounts: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount diff --git a/tests/e2e/instrumentation-dotnet/01-install-app.yaml b/tests/e2e/instrumentation-dotnet/01-install-app.yaml index 15c652bac4..ecffa5883f 100644 --- a/tests/e2e/instrumentation-dotnet/01-install-app.yaml +++ b/tests/e2e/instrumentation-dotnet/01-install-app.yaml @@ -21,4 +21,4 @@ spec: fsGroup: 2000 containers: - name: myapp - image: docker.io/adib070/mvc + image: docker.io/avadhutp123/aspnetapp:latest From 20c0b71255892eca5c76f1caf2ce4a5ab964b663 Mon Sep 17 00:00:00 2001 From: Avadhut Pisal Date: Mon, 10 Oct 2022 19:33:24 +0530 Subject: [PATCH 2/2] adds source code repo link for the application --- .../instrumentation-dotnet-multicontainer/01-install-app.yaml | 2 +- .../instrumentation-dotnet-multicontainer/02-install-app.yaml | 2 +- tests/e2e/instrumentation-dotnet/01-install-app.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml b/tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml index 923b2764c3..e64bc4f569 100644 --- a/tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml +++ b/tests/e2e/instrumentation-dotnet-multicontainer/01-install-app.yaml @@ -18,6 +18,6 @@ spec: spec: containers: - name: myapp - image: docker.io/avadhutp123/aspnetapp:latest + image: docker.io/avadhutp123/aspnetapp:latest # source code of the application: https://github.com/dotnet/dotnet-docker/tree/main/samples/aspnetapp - name: myrabbit image: rabbitmq diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml b/tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml index 311a8f75de..9b86d167ca 100644 --- a/tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml +++ b/tests/e2e/instrumentation-dotnet-multicontainer/02-install-app.yaml @@ -18,6 +18,6 @@ spec: spec: containers: - name: myapp - image: docker.io/avadhutp123/aspnetapp:latest + image: docker.io/avadhutp123/aspnetapp:latest # source code of the application: https://github.com/dotnet/dotnet-docker/tree/main/samples/aspnetapp - name: myrabbit image: rabbitmq diff --git a/tests/e2e/instrumentation-dotnet/01-install-app.yaml b/tests/e2e/instrumentation-dotnet/01-install-app.yaml index ecffa5883f..589b4d9c83 100644 --- a/tests/e2e/instrumentation-dotnet/01-install-app.yaml +++ b/tests/e2e/instrumentation-dotnet/01-install-app.yaml @@ -21,4 +21,4 @@ spec: fsGroup: 2000 containers: - name: myapp - image: docker.io/avadhutp123/aspnetapp:latest + image: docker.io/avadhutp123/aspnetapp:latest # source code of the application: https://github.com/dotnet/dotnet-docker/tree/main/samples/aspnetapp