Revert "feat(telemetry): centralize konflux telemetry configuration in commonlib"

Author: ashwindasr

jobs/build/build-sync-konflux/Jenkinsfile

@@ -38,6 +38,8 @@ node() {
                 commonlib.mockParam(),
                 commonlib.ocpVersionParam('BUILD_VERSION', '4'),
                 commonlib.artToolsParam(),
+                commonlib.enableTelemetryParam(),
+                commonlib.telemetryEndpointParam(),
                 string(
                     name: 'ASSEMBLY',
                     description: 'The name of an assembly to sync.',
@@ -106,8 +108,6 @@ node() {
                     description : 'WARNING: Only enable this if a payload containing embargoed build(s) is being promoted after embargo lift',
                     defaultValue: false,
                 ),
-                commonlib.enableTelemetryParam(),
-                commonlib.telemetryEndpointParam(),
             ],
         ]
     ])  // Please update README.md if modifying parameter names or semantics
@@ -164,6 +164,12 @@ node() {
         if (params.DRY_RUN) {
             cmd << "--dry-run"
         }
+        if (params.TELEMETRY_ENABLED) {
+            env.TELEMETRY_ENABLED = "1"
+            if (params.OTEL_EXPORTER_OTLP_ENDPOINT && params.OTEL_EXPORTER_OTLP_ENDPOINT != "") {
+                env.OTEL_EXPORTER_OTLP_ENDPOINT = params.OTEL_EXPORTER_OTLP_ENDPOINT
+            }
+        }
         cmd += [
             "build-sync",
             "--version=${params.BUILD_VERSION}",
@@ -210,14 +216,7 @@ node() {
                     file(credentialsId: 'konflux-gcp-app-creds-prod', variable: 'GOOGLE_APPLICATION_CREDENTIALS'),
                     file(credentialsId: 'konflux-art-images-auth-file', variable: 'KONFLUX_ART_IMAGES_AUTH_FILE'),
                 ]) {
-                    def envVars = ["BUILD_URL=${BUILD_URL}", "JOB_NAME=${JOB_NAME}"]
-                    if (params.TELEMETRY_ENABLED) {
-                        envVars << "TELEMETRY_ENABLED=1"
-                        if (params.OTEL_EXPORTER_OTLP_ENDPOINT && params.OTEL_EXPORTER_OTLP_ENDPOINT != "") {
-                            envVars << "OTEL_EXPORTER_OTLP_ENDPOINT=${params.OTEL_EXPORTER_OTLP_ENDPOINT}"
-                        }
-                    }
-                    withEnv(envVars) {
+                    withEnv(["BUILD_URL=${BUILD_URL}", "JOB_NAME=${JOB_NAME}"]) {
                         sh(script: cmd.join(' '), returnStdout: true)
                     }
                 }

jobs/build/build-sync/Jenkinsfile

@@ -38,6 +38,8 @@ node() {
                 commonlib.mockParam(),
                 commonlib.ocpVersionParam('BUILD_VERSION', '4'),
                 commonlib.artToolsParam(),
+                commonlib.enableTelemetryParam(),
+                commonlib.telemetryEndpointParam(),
                 string(
                     name: 'ASSEMBLY',
                     description: 'The name of an assembly to sync.',
@@ -168,6 +170,12 @@ node() {
         if (params.DRY_RUN) {
             cmd << "--dry-run"
         }
+        if (params.TELEMETRY_ENABLED) {
+            env.TELEMETRY_ENABLED = "1"
+            if (params.OTEL_EXPORTER_OTLP_ENDPOINT && params.OTEL_EXPORTER_OTLP_ENDPOINT != "") {
+                env.OTEL_EXPORTER_OTLP_ENDPOINT = params.OTEL_EXPORTER_OTLP_ENDPOINT
+            }
+        }
         cmd += [
             "build-sync",
             "--version=${params.BUILD_VERSION}",

jobs/build/ocp4-konflux/Jenkinsfile

@@ -118,8 +118,8 @@ node {
                         description: '(For testing) Skip the OLM bundle build step',
                         defaultValue: false,  // Default to true until we believe bundle build is stable.
                     ),
-                    commonlib.enableTelemetryParam(),
-                    commonlib.telemetryEndpointParam(),
+                    commonlib.enableTelemetryParam() + [defaultValue: true],
+                    commonlib.telemetryEndpointParam() + [defaultValue: 'http://internal-a344ed20604f143d7955b3c06c517eb8-1688607883.us-east-1.elb.amazonaws.com:4317'],
                 ]
             ],
         ]

pipeline-scripts/commonlib.groovy

@@ -125,7 +125,7 @@ def enableTelemetryParam() {
         name: 'TELEMETRY_ENABLED',
         description: 'Enable or disable sending traces to otel',
         $class: 'BooleanParameterDefinition',
-        defaultValue: true
+        defaultValue: false
     ]
 }
 
@@ -134,7 +134,7 @@ def telemetryEndpointParam() {
         name: 'OTEL_EXPORTER_OTLP_ENDPOINT',
         description: 'A base endpoint URL for any signal type, with an optionally-specified port number. Helpful for when you’re sending more than one signal to the same endpoint and want one environment variable to control the endpoint',
         $class: 'hudson.model.StringParameterDefinition',
-        defaultValue: 'http://internal-a344ed20604f143d7955b3c06c517eb8-1688607883.us-east-1.elb.amazonaws.com:4317'
+        defaultValue: ''
     ]
 }