Remove support for the experimental OpenTelemetry-based Jaeger (#1379)

This commit removes the support for the experimental OpenTelemetry-based Jaeger that is part of Jaeger v1, as additional binaries/images. Jaeger v2 will be completely based on OpenTelemetry and we'll have the Jaeger Operator v2 to handle this.

This also partially fixes #1378, as I needed to change the agent flags to use the new flag in order to get the test suite to pass.

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>

.ci/run-e2e-tests.sh

@@ -11,12 +11,6 @@ if [ "${TEST_GROUP}" = "es" ]; then
     echo "Running elasticsearch tests"
     make es
     make e2e-tests-es
-elif [ "${TEST_GROUP}" = "es-otel" ]; then
-    echo "Running elasticsearch tests with OTEL collector"
-    export SPECIFY_OTEL_IMAGES=true
-    export SPECIFY_OTEL_CONFIG=true
-    make es
-    make e2e-tests-es
 elif [ "${TEST_GROUP}" = "es-self-provisioned" ]; then
     echo "Running self provisioned elasticsearch tests"
     make e2e-tests-self-provisioned-es
@@ -38,12 +32,6 @@ elif [ "${TEST_GROUP}" = "streaming" ]
 then
     echo "Running Streaming Tests"
     make e2e-tests-streaming
-elif [ "${TEST_GROUP}" = "streaming-otel" ]
-then
-    echo "Running Streaming Tests with OTEL collector and ingester"
-    export SPECIFY_OTEL_IMAGES=true
-    export SPECIFY_OTEL_CONFIG=true
-    make e2e-tests-streaming
 elif [ "${TEST_GROUP}" = "examples1" ]
 then
     echo "Running Examples1 Tests"
@@ -64,12 +52,6 @@ elif [ "${TEST_GROUP}" = "upgrade" ]
 then
     echo "Running upgrade tests"
     make e2e-tests-upgrade
-elif [ "${TEST_GROUP}" = "smoke-otel" ]
-then
-    echo "Running Smoke Tests with OTEL collector"
-    export SPECIFY_OTEL_IMAGES=true
-    export SPECIFY_OTEL_CONFIG=true
-    make e2e-tests-smoke
 elif [ "${TEST_GROUP}" = "istio" ]
 then
     echo "Running Smoke Tests with istio"

.github/mergify.yml

@@ -17,8 +17,6 @@ pull_request_rules:
       - "status-success=end-to-end (examples1)"
       - "status-success=end-to-end (examples2)"
       - "status-success=end-to-end (generate)"
-      - "status-success=end-to-end (es-otel)"
-      - "status-success=end-to-end (streaming-otel)"
       - "status-success=DCO"
       - "status-success=WIP"
       - "status-success=codecov/patch" # we don't require those, but we might want to manually check before automatically merging

.github/workflows/e2e-kubernetes.yaml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-16.04
     strategy:
       matrix:
-        TEST_GROUP: [smoke, es, cassandra, streaming, examples1, examples2, generate, es-otel, streaming-otel, smoke-otel, upgrade, istio]
+        TEST_GROUP: [smoke, es, cassandra, streaming, examples1, examples2, generate, upgrade, istio]
     steps:
     - uses: actions/setup-go@v1
       with:

examples/simplest.yaml

@@ -2,3 +2,8 @@ apiVersion: jaegertracing.io/v1
 kind: Jaeger
 metadata:
   name: simplest
+spec:
+  allInOne:
+    image: jaegertracing/all-in-one:latest
+  agent:
+    image: jaegertracing/jaeger-agent:latest

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/opentracing/opentracing-go v1.1.1-0.20190913142402-a7454ce5950e
 	github.com/operator-framework/operator-sdk v0.18.2
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/common v0.9.1
 	github.com/sirupsen/logrus v1.5.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/viper v1.7.1

go.sum

@@ -93,9 +93,11 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
@@ -1415,6 +1417,7 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=