Skip to content

Commit b3c4bde

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#81997 from hwdef/fix-t/e/i/logging
use log functions of core framework
2 parents 6f1d84c + 888c847 commit b3c4bde

File tree

13 files changed

+55
-67
lines changed

13 files changed

+55
-67
lines changed

‎test/e2e/instrumentation/logging/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ go_library(
1616
"//staging/src/k8s.io/api/core/v1:go_default_library",
1717
"//test/e2e/framework:go_default_library",
1818
"//test/e2e/framework/config:go_default_library",
19-
"//test/e2e/framework/log:go_default_library",
2019
"//test/e2e/instrumentation/common:go_default_library",
2120
"//test/e2e/instrumentation/logging/elasticsearch:go_default_library",
2221
"//test/e2e/instrumentation/logging/stackdriver:go_default_library",

‎test/e2e/instrumentation/logging/elasticsearch/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ go_library(
2020
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
2121
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
2222
"//test/e2e/framework:go_default_library",
23-
"//test/e2e/framework/log:go_default_library",
2423
"//test/e2e/framework/pod:go_default_library",
2524
"//test/e2e/framework/service:go_default_library",
2625
"//test/e2e/instrumentation/common:go_default_library",

‎test/e2e/instrumentation/logging/elasticsearch/kibana.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/labels"
2525
"k8s.io/kubernetes/test/e2e/framework"
26-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2726
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
2827
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
2928
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
@@ -64,7 +63,7 @@ func ClusterLevelLoggingWithKibana(f *framework.Framework) {
6463
// being run as the first e2e test just after the e2e cluster has been created.
6564
err := wait.Poll(pollingInterval, pollingTimeout, func() (bool, error) {
6665
if _, err := s.Get("kibana-logging", metav1.GetOptions{}); err != nil {
67-
e2elog.Logf("Kibana is unreachable: %v", err)
66+
framework.Logf("Kibana is unreachable: %v", err)
6867
return false, nil
6968
}
7069
return true, nil
@@ -86,7 +85,7 @@ func ClusterLevelLoggingWithKibana(f *framework.Framework) {
8685
err = wait.Poll(pollingInterval, pollingTimeout, func() (bool, error) {
8786
req, err := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
8887
if err != nil {
89-
e2elog.Logf("Failed to get services proxy request: %v", err)
88+
framework.Logf("Failed to get services proxy request: %v", err)
9089
return false, nil
9190
}
9291

@@ -98,7 +97,7 @@ func ClusterLevelLoggingWithKibana(f *framework.Framework) {
9897
Name("kibana-logging").
9998
DoRaw()
10099
if err != nil {
101-
e2elog.Logf("Proxy call to kibana-logging failed: %v", err)
100+
framework.Logf("Proxy call to kibana-logging failed: %v", err)
102101
return false, nil
103102
}
104103
return true, nil

‎test/e2e/instrumentation/logging/elasticsearch/utils.go‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"k8s.io/apimachinery/pkg/fields"
2727
api "k8s.io/kubernetes/pkg/apis/core"
2828
"k8s.io/kubernetes/test/e2e/framework"
29-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3029
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3130
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
3231
"k8s.io/kubernetes/test/e2e/instrumentation/logging/utils"
@@ -57,7 +56,7 @@ func newEsLogProvider(f *framework.Framework) (*esLogProvider, error) {
5756
func (p *esLogProvider) Init() error {
5857
f := p.Framework
5958
// Check for the existence of the Elasticsearch service.
60-
e2elog.Logf("Checking the Elasticsearch service exists.")
59+
framework.Logf("Checking the Elasticsearch service exists.")
6160
s := f.ClientSet.CoreV1().Services(api.NamespaceSystem)
6261
// Make a few attempts to connect. This makes the test robust against
6362
// being run as the first e2e test just after the e2e cluster has been created.
@@ -66,14 +65,14 @@ func (p *esLogProvider) Init() error {
6665
if _, err = s.Get("elasticsearch-logging", meta_v1.GetOptions{}); err == nil {
6766
break
6867
}
69-
e2elog.Logf("Attempt to check for the existence of the Elasticsearch service failed after %v", time.Since(start))
68+
framework.Logf("Attempt to check for the existence of the Elasticsearch service failed after %v", time.Since(start))
7069
}
7170
if err != nil {
7271
return err
7372
}
7473

7574
// Wait for the Elasticsearch pods to enter the running state.
76-
e2elog.Logf("Checking to make sure the Elasticsearch pods are running")
75+
framework.Logf("Checking to make sure the Elasticsearch pods are running")
7776
labelSelector := fields.SelectorFromSet(fields.Set(map[string]string{"k8s-app": "elasticsearch-logging"})).String()
7877
options := meta_v1.ListOptions{LabelSelector: labelSelector}
7978
pods, err := f.ClientSet.CoreV1().Pods(api.NamespaceSystem).List(options)
@@ -87,15 +86,15 @@ func (p *esLogProvider) Init() error {
8786
}
8887
}
8988

90-
e2elog.Logf("Checking to make sure we are talking to an Elasticsearch service.")
89+
framework.Logf("Checking to make sure we are talking to an Elasticsearch service.")
9190
// Perform a few checks to make sure this looks like an Elasticsearch cluster.
9291
var statusCode int
9392
err = nil
9493
var body []byte
9594
for start := time.Now(); time.Since(start) < esRetryTimeout; time.Sleep(esRetryDelay) {
9695
proxyRequest, errProxy := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
9796
if errProxy != nil {
98-
e2elog.Logf("After %v failed to get services proxy request: %v", time.Since(start), errProxy)
97+
framework.Logf("After %v failed to get services proxy request: %v", time.Since(start), errProxy)
9998
continue
10099
}
101100
// Query against the root URL for Elasticsearch.
@@ -106,11 +105,11 @@ func (p *esLogProvider) Init() error {
106105
response.StatusCode(&statusCode)
107106

108107
if err != nil {
109-
e2elog.Logf("After %v proxy call to elasticsearch-loigging failed: %v", time.Since(start), err)
108+
framework.Logf("After %v proxy call to elasticsearch-loigging failed: %v", time.Since(start), err)
110109
continue
111110
}
112111
if int(statusCode) != 200 {
113-
e2elog.Logf("After %v Elasticsearch cluster has a bad status: %v", time.Since(start), statusCode)
112+
framework.Logf("After %v Elasticsearch cluster has a bad status: %v", time.Since(start), statusCode)
114113
continue
115114
}
116115
break
@@ -119,17 +118,17 @@ func (p *esLogProvider) Init() error {
119118
return err
120119
}
121120
if int(statusCode) != 200 {
122-
e2elog.Failf("Elasticsearch cluster has a bad status: %v", statusCode)
121+
framework.Failf("Elasticsearch cluster has a bad status: %v", statusCode)
123122
}
124123

125124
// Now assume we really are talking to an Elasticsearch instance.
126125
// Check the cluster health.
127-
e2elog.Logf("Checking health of Elasticsearch service.")
126+
framework.Logf("Checking health of Elasticsearch service.")
128127
healthy := false
129128
for start := time.Now(); time.Since(start) < esRetryTimeout; time.Sleep(esRetryDelay) {
130129
proxyRequest, errProxy := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
131130
if errProxy != nil {
132-
e2elog.Logf("After %v failed to get services proxy request: %v", time.Since(start), errProxy)
131+
framework.Logf("After %v failed to get services proxy request: %v", time.Since(start), errProxy)
133132
continue
134133
}
135134
body, err = proxyRequest.Namespace(api.NamespaceSystem).
@@ -143,17 +142,17 @@ func (p *esLogProvider) Init() error {
143142
health := make(map[string]interface{})
144143
err := json.Unmarshal(body, &health)
145144
if err != nil {
146-
e2elog.Logf("Bad json response from elasticsearch: %v", err)
145+
framework.Logf("Bad json response from elasticsearch: %v", err)
147146
continue
148147
}
149148
statusIntf, ok := health["status"]
150149
if !ok {
151-
e2elog.Logf("No status field found in cluster health response: %v", health)
150+
framework.Logf("No status field found in cluster health response: %v", health)
152151
continue
153152
}
154153
status := statusIntf.(string)
155154
if status != "green" && status != "yellow" {
156-
e2elog.Logf("Cluster health has bad status: %v", health)
155+
framework.Logf("Cluster health has bad status: %v", health)
157156
continue
158157
}
159158
if err == nil && ok {
@@ -177,12 +176,12 @@ func (p *esLogProvider) ReadEntries(name string) []utils.LogEntry {
177176

178177
proxyRequest, errProxy := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get())
179178
if errProxy != nil {
180-
e2elog.Logf("Failed to get services proxy request: %v", errProxy)
179+
framework.Logf("Failed to get services proxy request: %v", errProxy)
181180
return nil
182181
}
183182

184183
query := fmt.Sprintf("kubernetes.pod_name:%s AND kubernetes.namespace_name:%s", name, f.Namespace.Name)
185-
e2elog.Logf("Sending a search request to Elasticsearch with the following query: %s", query)
184+
framework.Logf("Sending a search request to Elasticsearch with the following query: %s", query)
186185

187186
// Ask Elasticsearch to return all the log lines that were tagged with the
188187
// pod name. Ask for ten times as many log lines because duplication is possible.
@@ -194,26 +193,26 @@ func (p *esLogProvider) ReadEntries(name string) []utils.LogEntry {
194193
Param("size", strconv.Itoa(searchPageSize)).
195194
DoRaw()
196195
if err != nil {
197-
e2elog.Logf("Failed to make proxy call to elasticsearch-logging: %v", err)
196+
framework.Logf("Failed to make proxy call to elasticsearch-logging: %v", err)
198197
return nil
199198
}
200199

201200
var response map[string]interface{}
202201
err = json.Unmarshal(body, &response)
203202
if err != nil {
204-
e2elog.Logf("Failed to unmarshal response: %v", err)
203+
framework.Logf("Failed to unmarshal response: %v", err)
205204
return nil
206205
}
207206

208207
hits, ok := response["hits"].(map[string]interface{})
209208
if !ok {
210-
e2elog.Logf("response[hits] not of the expected type: %T", response["hits"])
209+
framework.Logf("response[hits] not of the expected type: %T", response["hits"])
211210
return nil
212211
}
213212

214213
h, ok := hits["hits"].([]interface{})
215214
if !ok {
216-
e2elog.Logf("Hits not of the expected type: %T", hits["hits"])
215+
framework.Logf("Hits not of the expected type: %T", hits["hits"])
217216
return nil
218217
}
219218

@@ -222,13 +221,13 @@ func (p *esLogProvider) ReadEntries(name string) []utils.LogEntry {
222221
for _, e := range h {
223222
l, ok := e.(map[string]interface{})
224223
if !ok {
225-
e2elog.Logf("Element of hit not of expected type: %T", e)
224+
framework.Logf("Element of hit not of expected type: %T", e)
226225
continue
227226
}
228227

229228
source, ok := l["_source"].(map[string]interface{})
230229
if !ok {
231-
e2elog.Logf("_source not of the expected type: %T", l["_source"])
230+
framework.Logf("_source not of the expected type: %T", l["_source"])
232231
continue
233232
}
234233

@@ -244,7 +243,7 @@ func (p *esLogProvider) ReadEntries(name string) []utils.LogEntry {
244243
continue
245244
}
246245

247-
e2elog.Logf("Log is of unknown type, got %v, want string or object in field 'log'", source)
246+
framework.Logf("Log is of unknown type, got %v, want string or object in field 'log'", source)
248247
}
249248

250249
return entries

‎test/e2e/instrumentation/logging/generic_soak.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"k8s.io/api/core/v1"
2828
"k8s.io/kubernetes/test/e2e/framework"
2929
"k8s.io/kubernetes/test/e2e/framework/config"
30-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3130
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
3231
imageutils "k8s.io/kubernetes/test/utils/image"
3332
)
@@ -61,14 +60,14 @@ var _ = instrumentation.SIGDescribe("Logging soak [Performance] [Slow] [Disrupti
6160
defer wg.Done()
6261
defer ginkgo.GinkgoRecover()
6362
wave := fmt.Sprintf("wave%v", strconv.Itoa(i))
64-
e2elog.Logf("Starting logging soak, wave = %v", wave)
63+
framework.Logf("Starting logging soak, wave = %v", wave)
6564
RunLogPodsWithSleepOf(f, kbRateInSeconds, wave, totalLogTime)
66-
e2elog.Logf("Completed logging soak, wave %v", i)
65+
framework.Logf("Completed logging soak, wave %v", i)
6766
}()
6867
// Niceness.
6968
time.Sleep(loggingSoak.TimeBetweenWaves)
7069
}
71-
e2elog.Logf("Waiting on all %v logging soak waves to complete", loggingSoak.Scale)
70+
framework.Logf("Waiting on all %v logging soak waves to complete", loggingSoak.Scale)
7271
wg.Wait()
7372
})
7473
})
@@ -122,8 +121,8 @@ func RunLogPodsWithSleepOf(f *framework.Framework, sleep time.Duration, podname
122121
pods, err := logSoakVerification.WaitFor(totalPods, timeout+largeClusterForgiveness)
123122

124123
if err != nil {
125-
e2elog.Failf("Error in wait... %v", err)
124+
framework.Failf("Error in wait... %v", err)
126125
} else if len(pods) < totalPods {
127-
e2elog.Failf("Only got %v out of %v", len(pods), totalPods)
126+
framework.Failf("Only got %v out of %v", len(pods), totalPods)
128127
}
129128
}

‎test/e2e/instrumentation/logging/stackdriver/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ go_library(
1818
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
1919
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
2020
"//test/e2e/framework:go_default_library",
21-
"//test/e2e/framework/log:go_default_library",
2221
"//test/e2e/instrumentation/common:go_default_library",
2322
"//test/e2e/instrumentation/logging/utils:go_default_library",
2423
"//vendor/github.com/onsi/ginkgo:go_default_library",

‎test/e2e/instrumentation/logging/stackdriver/basic.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222

2323
"k8s.io/apimachinery/pkg/util/wait"
2424
"k8s.io/kubernetes/test/e2e/framework"
25-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2625
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
2726
"k8s.io/kubernetes/test/e2e/instrumentation/logging/utils"
2827

@@ -156,7 +155,7 @@ var _ = instrumentation.SIGDescribe("Cluster level logging implemented by Stackd
156155
podName := fmt.Sprintf("synthlogger-%s", string(uuid.NewUUID()))
157156
err := utils.NewLoadLoggingPod(podName, "", 1, 1*time.Second).Start(f)
158157
if err != nil {
159-
e2elog.Logf("Failed to create a logging pod: %v", err)
158+
framework.Logf("Failed to create a logging pod: %v", err)
160159
}
161160
return false, nil
162161
}, stopCh)

‎test/e2e/instrumentation/logging/stackdriver/soak.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"time"
2323

2424
"k8s.io/kubernetes/test/e2e/framework"
25-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2625
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
2726
"k8s.io/kubernetes/test/e2e/instrumentation/logging/utils"
2827

@@ -86,7 +85,7 @@ var _ = instrumentation.SIGDescribe("Cluster level logging implemented by Stackd
8685
// Starting one pod on each node.
8786
for _, pod := range podsByRun[runIdx] {
8887
if err := pod.Start(f); err != nil {
89-
e2elog.Logf("Failed to start pod: %v", err)
88+
framework.Logf("Failed to start pod: %v", err)
9089
}
9190
}
9291
<-t.C

0 commit comments

Comments
 (0)