8000 Remove OpenTracing Module for NGINX Plus R34 (#7567) · nginx/kubernetes-ingress@aac7917 · GitHub
[go: up one dir, main page]
Skip to content

Commit aac7917

Browse files
jjngxhaywoodsh
authored and
pdabelf5
committed
Remove OpenTracing Module for NGINX Plus R34 (#7567)
* remove nginx plus opentracing module, reject opentracing configmap key if nginxplus flag is set to true Signed-off-by: Haywood Shannon <5781935+haywoodsh@users.noreply.github.com> Co-authored-by: Haywood Shannon <5781935+haywoodsh@users.noreply.github.com>
1 parent bca1685 commit aac7917

File tree

5 files changed

+222
-92
lines changed

5 files changed

+222
-92
lines changed

‎build/Dockerfile‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,12 @@ ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
114114

115115
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
116116
--mount=type=secret,id=nginx-repo.key,dst=/etc/apk/cert.key,mode=0644 \
117-
--mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
118117
--mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk/keys/nginx_signing.rsa.pub \
119118
--mount=type=bind,from=nginx-files,src=user_agent,target=/tmp/user_agent \
120119
--mount=type=bind,from=nginx-files,src=tracking.info,target=/tmp/nginx/reporting/tracking.info \
121120
export $(cat /tmp/user_agent) \
122121
&& printf "%s\n" "https://${PACKAGE_REPO}/plus/${NGINX_PLUS_VERSION}/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
123-
&& apk add --no-cache nginx-plus nginx-plus-module-njs nginx-plus-module-opentracing nginx-plus-module-fips-check libcap libcurl \
124-
&& cp -av /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
122+
&& apk add --no-cache nginx-plus nginx-plus-module-njs nginx-plus-module-fips-check libcap libcurl \
125123
&& mkdir -p /etc/nginx/reporting/ && cp -av /tmp/nginx/reporting/tracking.info /etc/nginx/reporting/tracking.info \
126124
&& ldconfig /usr/local/lib/ \
127125
&& sed -i -e '/nginx.com/d' /etc/apk/repositories
@@ -154,7 +152,6 @@ ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
154152
RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
155153
--mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
156154
--mount=type=secret,id=nginx-repo.key,dst=/etc/apk/cert.key,mode=0644 \
157-
--mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
158155
--mount=type=bind,from=nginx-files,src=app-protect-security-updates.rsa.pub,target=/etc/apk/keys/app-protect-security-updates.rsa.pub \
159156
--mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk/keys/nginx_signing.rsa.pub \
160157
--mount=type=bind,from=nginx-files,src=agent.sh,target=/usr/local/bin/agent.sh \
@@ -164,13 +161,12 @@ RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
164161
&& printf "%s\n" "https://${PACKAGE_REPO}/app-protect/${NGINX_PLUS_VERSION}/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
165162
&& printf "%s\n" "https://pkgs.nginx.com/app-protect-security-updates/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
166163
&& printf "%s\n" "https://${PACKAGE_REPO}/nginx-agent/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
167-
&& apk add --no-cache libcap-utils libcurl nginx-plus nginx-plus-module-njs nginx-plus-module-opentracing nginx-plus-module-fips-check \
164+
&& apk add --no-cache libcap-utils libcurl nginx-plus nginx-plus-module-njs nginx-plus-module-fips-check \
168165
&& if [ "${NGINX_AGENT}" = "true" ]; then apk add --no-cache nginx-agent; fi \
169166
&& mkdir -p /usr/ssl \
170167
&& cp -av /tmp/fips/usr/lib/ossl-modules/fips.so /usr/lib/ossl-modules/fips.so \
171168
&& cp -av /tmp/fips/usr/ssl/fipsmodule.cnf /usr/ssl/fipsmodule.cnf \
172169
&& cp -av /tmp/fips/etc/ssl/openssl.cnf /etc/ssl/openssl.cnf \
173-
&& cp -av /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
174170
&& mkdir -p /etc/nginx/reporting/ \
175171
&& cp -av /tmp/nginx/reporting/tracking.info /etc/nginx/reporting/tracking.info \
176172
&& ldconfig /usr/local/lib/ \
@@ -194,21 +190,19 @@ ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
194190
RUN --mount=type=bind,from=alpine-fips-3.19,target=/tmp/fips/ \
195191
--mount=type=secret,id=nginx-repo.crt,dst=/etc/apk/cert.pem,mode=0644 \
196192
--mount=type=secret,id=nginx-repo.key,dst=/etc/apk/cert.key,mode=0644 \
197-
--mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \
198193
--mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk/keys/nginx_signing.rsa.pub \
199194
--mount=type=bind,from=nginx-files,src=agent.sh,target=/usr/local/bin/agent.sh \
200195
--mount=type=bind,from=nginx-files,src=nap-waf.sh,target=/usr/local/bin/nap-waf.sh \
201196
--mount=type=bind,from=nginx-files,src=tracking.info,target=/tmp/nginx/reporting/tracking.info \
202197
printf "%s\n" "https://${PACKAGE_REPO}/plus/${NGINX_PLUS_VERSION}/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
203198
&& printf "%s\n" "https://${PACKAGE_REPO}/app-protect-x-plus/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
204199
&& printf "%s\n" "https://${PACKAGE_REPO}/nginx-agent/alpine/v$(grep -E -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
205-
&& apk add --no-cache libcap-utils libcurl nginx-plus nginx-plus-module-njs nginx-plus-module-opentracing nginx-plus-module-fips-check \
200+
&& apk add --no-cache libcap-utils libcurl nginx-plus nginx-plus-module-njs nginx-plus-module-fips-check \
206201
&& if [ "${NGINX_AGENT}" = "true" ]; then apk add --no-cache nginx-agent; fi \
207202
&& mkdir -p /usr/ssl \
208203
&& cp -av /tmp/fips/usr/lib/ossl-modules/fips.so /usr/lib/ossl-modules/fips.so \
209204
&& cp -av /tmp/fips/usr/ssl/fipsmodule.cnf /usr/ssl/fipsmodule.cnf \
210205
&& cp -av /tmp/fips/etc/ssl/openssl.cnf /etc/ssl/openssl.cnf \
211-
&& cp -av /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
212206
&& mkdir -p /etc/nginx/reporting/ \
213207
&& cp -av /tmp/nginx/reporting/tracking.info /etc/nginx/reporting/tracking.info \
214208
&& ldconfig /usr/local/lib/ \
@@ -229,7 +223,6 @@ ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
229223
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
230224
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
231225
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
232-
--mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
233226
--mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_signing.key \
234227
--mount=type=bind,from=nginx-files,src=app-protect-security-updates.key,target=/tmp/app-protect-security-updates.key \
235228
--mount=type=bind,from=nginx-files,src=90pkgs-nginx,target=/etc/apt/apt.conf.d/90pkgs-nginx \
@@ -243,9 +236,8 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
243236
&& gpg --dearmor -o /usr/share/keyrings/app-protect-archive-keyring.gpg /tmp/app-protect-security-updates.key \
244237
&& cp /tmp/nginx-plus.sources /etc/apt/sources.list.d/nginx-plus.sources \
245238
&& apt-get update \
246-
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-plus nginx-plus-module-njs nginx-plus-module-opentracing nginx-plus-module-fips-check \
239+
&& apt-get install --no-install-recommends --no-install-suggests -y nginx-plus nginx-plus-module-njs nginx-plus-module-fips-check \
247240
&& apt-get purge --auto-remove -y gpg \
248-
&& cp -av /tmp/ot/usr/local/lib/libjaegertracing*so* /tmp/ot/usr/local/lib/libzipkin*so* /tmp/ot/usr/local/lib/libdd*so* /tmp/ot/usr/local/lib/libyaml*so* /usr/local/lib/ \
249241
&& mkdir -p /etc/nginx/reporting/ \
250242
&& cp -av /tmp/nginx/reporting/tracking.info /etc/nginx/reporting/tracking.info \
251243
&& ldconfig \
@@ -262,7 +254,6 @@ ENV NGINX_VERSION=${NGINX_PLUS_VERSION}
262254

263255
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
264256
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
265-
--mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \
266257
--mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_signing.key \
267258
--mount=type=bind,from=nginx-files,src=90pkgs-nginx,target=/etc/apt/apt.conf.d/90pkgs-nginx \
268259
--mount=type=bind,from=nginx-files,src=nap-waf-12.sources,target=/tmp/app-protect.sources \
@@ -321,7 +312,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
321312
&& apt-get update \
322313
&& if [ "${NGINX_AGENT}" = "true" ]; then apt-get install --no-install-recommends --no-install-suggests -y nginx-agent; fi \
323314
&& if [ -z "${NAP_MODULES##*waf*}" ]; then \
324-
apt-get install --no-install-recommends --no-install-suggests -y app-protect-module-plus=33+5.264* nginx-plus-module-appprotect=33+5.264*; \
315+
apt-get install --no-install-recommends --no-install-suggests -y app-protect-module-plus=33+5.264* nginx-plus-module-appprotect=33+5.264* app-protect-plugin=6.9.0*; \
325316
rm -f /etc/apt/sources.list.d/app-protect.sources; \
326317
nap-waf.sh; \
327318
fi \

‎internal/configs/configmaps.go‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has
538538
cfgParams.MainOpenTracingTracerConfig = openTracingTracerConfig
539539
}
540540

541-
if cfgParams.MainOpenTracingTracer != "" || cfgParams.MainOpenTracingTracerConfig != "" {
541+
if cfgParams.MainOpenTracingTracer != "" && cfgParams.MainOpenTracingTracerConfig != "" {
542542
cfgParams.MainOpenTracingLoadModule = true
543543
}
544544

@@ -547,11 +547,14 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has
547547
nl.Error(l, err)
548548
eventLog.Event(cfgm, v1.EventTypeWarning, nl.EventReasonInvalidValue, err.Error())
549549
configOk = false
550+
} else if openTracing && nginxPlus {
551+
errorText := fmt.Sprintf("ConfigMap %s/%s key %s is not compatible with NGINX Plus", cfgm.Namespace, cfgm.Name, "opentracing")
552+
nl.Warn(l, errorText)
553+
eventLog.Event(cfgm, v1.EventTypeWarning, nl.EventReasonInvalidValue, errorText)
554+
configOk = false
555+
clearOpenTracingParams(cfgParams)
550556
} else if !openTracing {
551-
cfgParams.MainOpenTracingEnabled = false
552-
cfgParams.MainOpenTracingLoadModule = false
553-
cfgParams.MainOpenTracingTracer = ""
554-
cfgParams.MainOpenTracingTracerConfig = ""
557+
clearOpenTracingParams(cfgParams)
555558
} else {
556559
if cfgParams.MainOpenTracingLoadModule {
557560
cfgParams.MainOpenTracingEnabled = openTracing
@@ -674,6 +677,13 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has
674677
return cfgParams, configOk
675678
}
676679

680+
func clearOpenTracingParams(cfgParams *ConfigParams) {
681+
cfgParams.MainOpenTracingEnabled = false
682+
cfgParams.MainOpenTracingLoadModule = false
683+
cfgParams.MainOpenTracingTracer = ""
684+
cfgParams.MainOpenTracingTracerConfig = ""
685+
}
686+
677687
//nolint:gocyclo
678688
func parseConfigMapZoneSync(l *slog.Logger, cfgm *v1.ConfigMap, cfgParams *ConfigParams, eventLog record.EventRecorder, nginxPlus bool) (*ZoneSync, error) {
679689
if zoneSync, exists, err := GetMapKeyAsBool(cfgm.Data, "zone-sync", cfgm); exists {

‎internal/configs/configmaps_test.go‎

Lines changed: 142 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,12 +1170,14 @@ func makeEventLogger() record.EventRecorder {
11701170
func TestOpenTracingConfiguration(t *testing.T) {
11711171
t.Parallel()
11721172
tests := []struct {
1173-
configMap *v1.ConfigMap
1174-
enabled bool
1175-
loadModule bool
1176-
tracer string
1177-
tracerConfig string
1178-
msg string
1173+
configMap *v1.ConfigMap
1174+
isPlus bool
1175+
expectedOpenTracingEnabled bool
1176+
expectedLoadModule bool
1177+
expectedTracer string
1178+
expectedTracerConfig string
1179+
expectedConfigOk bool
1180+
msg string
11791181
}{
11801182
{
11811183
configMap: &v1.ConfigMap{
@@ -1185,11 +1187,42 @@ func TestOpenTracingConfiguration(t *testing.T) {
11851187
"opentracing-tracer-config": "/etc/nginx/opentracing.json",
11861188
},
11871189
},
1188-
enabled: true,
1189-
loadModule: true,
1190-
tracer: "/usr/local/lib/libjaegertracing.so",
1191-
tracerConfig: "/etc/nginx/opentracing.json",
1192-
msg: "opentracing enabled",
1190+
isPlus: false,
1191+
expectedOpenTracingEnabled: true,
1192+
expectedLoadModule: true,
1193+
expectedTracer: "/usr/local/lib/libjaegertracing.so",
1194+
expectedTracerConfig: "/etc/nginx/opentracing.json",
1195+
expectedConfigOk: true,
1196+
msg: "oss: opentracing enabled (valid)",
1197+
},
1198+
{
1199+
configMap: &v1.ConfigMap{
1200+
Data: map[string]string{
1201+
"opentracing": "true",
1202+
"opentracing-tracer": "/usr/local/lib/libjaegertracing.so",
1203+
},
1204+
},
1205+
isPlus: false,
1206+
expectedOpenTracingEnabled: false,
1207+
expectedLoadModule: false,
1208+
expectedTracer: "/usr/local/lib/libjaegertracing.so",
1209+
expectedTracerConfig: "",
1210+
expectedConfigOk: false,
1211+
msg: "oss: opentracing enabled, tracer-config not set (invalid)",
1212+
},
1213+
{
1214+
configMap: &v1.ConfigMap{
1215+
Data: map[string]string{
1216+
"opentracing": "true",
1217+
},
1218+
},
1219+
isPlus: false,
1220+
expectedOpenTracingEnabled: false,
1221+
expectedLoadModule: false,
1222+
expectedTracer: "",
1223+
expectedTracerConfig: "",
1224+
expectedConfigOk: false,
1225+
msg: "oss: opentracing enabled, tracer and tracer-config not set (invalid)",
11931226
},
11941227
{
11951228
configMap: &v1.ConfigMap{
@@ -1199,56 +1232,132 @@ func TestOpenTracingConfiguration(t *testing.T) {
11991232
"opentracing-tracer-config": "/etc/nginx/opentracing.json",
12001233
},
12011234
},
1202-
enabled: false,
1203-
loadModule: false,
1204-
tracer: "",
1205-
tracerConfig: "",
1206-
msg: "opentracing disabled",
1235+
isPlus: false,
1236+
expectedOpenTracingEnabled: false,
1237+
expectedLoadModule: false,
1238+
expectedTracer: "",
1239+
expectedTracerConfig: "",
1240+
expectedConfigOk: true,
1241+
msg: "oss: opentracing disabled, tracer and tracer-config set (valid)",
12071242
},
12081243
{
12091244
configMap: &v1.ConfigMap{
12101245
Data: map[string]string{
12111246
"opentracing": "false",
12121247
},
12131248
},
1214-
enabled: false,
1215-
loadModule: false,
1216-
tracer: "",
1217-
tracerConfig: "",
1218-
msg: "opentracing disabled",
1249+
isPlus: false,
1250+
expectedOpenTracingEnabled: false,
1251+
expectedLoadModule: false,
1252+
expectedTracer: "",
1253+
expectedTracerConfig: "",
1254+
expectedConfigOk: true,
1255+
msg: "oss: opentracing disabled (valid)",
1256+
},
1257+
{
1258+
configMap: &v1.ConfigMap{
1259+
Data: map[string]string{
1260+
"opentracing": "false",
1261+
},
1262+
},
1263+
isPlus: true,
1264+
expectedOpenTracingEnabled: false,
1265+
expectedLoadModule: false,
1266+
expectedTracer: "",
1267+
expectedTracerConfig: "",
1268+
expectedConfigOk: true,
1269+
msg: "plus: opentracing explicitly disabled (valid)",
1270+
},
1271+
{
1272+
configMap: &v1.ConfigMap{
1273+
Data: map[string]string{},
1274+
},
1275+
isPlus: true,
1276+
expectedOpenTracingEnabled: false,
1277+
expectedLoadModule: false,
1278+
expectedTracer: "",
1279+
expectedTracerConfig: "",
1280+
expectedConfigOk: true,
1281+
msg: "plus: no opentracing keys set (valid)",
1282+
},
1283+
{
1284+
configMap: &v1.ConfigMap{
1285+
Data: map[string]string{
1286+
"opentracing": "false",
1287+
"opentracing-tracer": "/usr/local/lib/libjaegertracing.so",
1288+
"opentracing-tracer-config": "/etc/nginx/opentracing.json",
1289+
},
1290+
},
1291+
isPlus: true,
1292+
expectedOpenTracingEnabled: false,
1293+
expectedLoadModule: false,
1294+
expectedTracer: "",
1295+
expectedTracerConfig: "",
1296+
expectedConfigOk: true,
1297+
msg: "plus: opentracing disabled, tracer and tracer-config set (valid)",
1298+
},
1299+
{
1300+
configMap: &v1.ConfigMap{
1301+
Data: map[string]string{
1302+
"opentracing": "true",
1303+
},
1304+
},
1305+
isPlus: true,
1306+
expectedOpenTracingEnabled: false,
1307+
expectedLoadModule: false,
1308+
expectedTracer: "",
1309+
expectedTracerConfig: "",
1310+
expectedConfigOk: false,
1311+
msg: "plus: opentracing enabled (invalid)",
1312+
},
1313+
{
1314+
configMap: &v1.ConfigMap{
1315+
Data: map[string]string{
1316+
"opentracing": "true",
1317+
"opentracing-tracer": "/usr/local/lib/libjaegertracing.so",
1318+
"opentracing-tracer-config": "/etc/nginx/opentracing.json",
1319+
},
1320+
},
1321+
isPlus: true,
1322+
expectedOpenTracingEnabled: false,
1323+
expectedLoadModule: false,
1324+
expectedTracer: "",
1325+
expectedTracerConfig: "",
1326+
expectedConfigOk: false,
1327+
msg: "plus: opentracing enabled, tracer and tracer-config set (invalid)",
12191328
},
12201329
}
1221-
nginxPlus := false
1330+
12221331
hasAppProtect := false
12231332
hasAppProtectDos := false
12241333
hasTLSPassthrough := false
12251334

12261335
for _, test := range tests {
12271336
t.Run(test.msg, func(t *testing.T) {
1228-
result, configOk := ParseConfigMap(context.Background(), test.configMap, nginxPlus,
1337+
result, configOk := ParseConfigMap(context.Background(), test.configMap, test.isPlus,
12291338
hasAppProtect, hasAppProtectDos, hasTLSPassthrough, makeEventLogger())
12301339

1231-
if !configOk {
1232-
t.Errorf("Expected valid config, got invalid")
1340+
if configOk != test.expectedConfigOk {
1341+
t.Errorf("configOk: want %v, got %v", test.expectedConfigOk, configOk)
12331342
}
1234-
if result.MainOpenTracingEnabled != test.enabled {
1343+
if result.MainOpenTracingEnabled != test.expectedOpenTracingEnabled {
12351344
t.Errorf("MainOpenTracingEnabled: want %v, got %v",
1236-
test.enabled, result.MainOpenTracingEnabled)
1345+
test.expectedOpenTracingEnabled, result.MainOpenTracingEnabled)
12371346
}
12381347

1239-
if result.MainOpenTracingLoadModule != test.loadModule {
1348+
if result.MainOpenTracingLoadModule != test.expectedLoadModule {
12401349
t.Errorf("MainOpenTracingLoadModule: want %v, got %v",
1241-
test.loadModule, result.MainOpenTracingLoadModule)
1350+
test.expectedLoadModule, result.MainOpenTracingLoadModule)
12421351
}
12431352

1244-
if result.MainOpenTracingTracer != test.tracer {
1353+
if result.MainOpenTracingTracer != test.expectedTracer {
12451354
t.Errorf("MainOpenTracingTracer: want %q, got %q",
1246-
test.tracer, result.MainOpenTracingTracer)
1355+
test.expectedTracer, result.MainOpenTracingTracer)
12471356
}
12481357

1249-
if result.MainOpenTracingTracerConfig != test.tracerConfig {
1358+
if result.MainOpenTracingTracerConfig != test.expectedTracerConfig {
12501359
t.Errorf("MainOpenTracingTracerConfig: want %q, got %q",
1251-
test.tracerConfig, result.MainOpenTracingTracerConfig)
1360+
test.expectedTracerConfig, result.MainOpenTracingTracerConfig)
12521361
}
12531362
})
12541363
}

0 commit comments

Comments
 (0)
0