LogDog: Add project namespacing to Archivist.

server/internal/logdog/archivist/storageSource.go

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package archivist
 
 import (
         "github.com/golang/protobuf/proto"
+        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/logdog/types"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/proto/logdog/logpb"
         "github.com/luci/luci-go/server/logdog/archive"
         "github.com/luci/luci-go/server/logdog/storage"
         "golang.org/x/net/context"
 )
 
 // storageSource is an archive.LogEntrySource that pulls log entries from
 // intermediate storage via its storage.Storage instance.
 type storageSource struct {
         context.Context
 
         st            storage.Storage    // the storage instance to read from
+        project       config.ProjectName // the path of the log stream
         path          types.StreamPath   // the path of the log stream
         terminalIndex types.MessageIndex // if >= 0, discard logs beyond this
 
         buf           []*logpb.LogEntry
         lastIndex     types.MessageIndex
         logEntryCount int64
 }
 
 func (s *storageSource) bufferEntries(start types.MessageIndex) error {
         bytes := 0
 
         req := storage.GetRequest{
-                Path:  s.path,
-                Index: start,
+                Project: s.project,
+                Path:    s.path,
+                Index:   start,
         }
         return s.st.Get(req, func(idx types.MessageIndex, d []byte) bool {
                 le := logpb.LogEntry{}
                 if err := proto.Unmarshal(d, &le); err != nil {
                         log.Fields{
                                 log.ErrorKey:  err,
                                 "streamIndex": idx,
                         }.Errorf(s, "Failed to unmarshal LogEntry.")
                         return false
                 }
@@ skipping 49 matching lines @@
                         "index":         sidx,
                         "terminalIndex": s.terminalIndex,
                 }.Warningf(s, "Discarding log entries beyond expected terminal index.")
                 return nil, archive.ErrEndOfStream
         }
 
         s.lastIndex = sidx
         s.logEntryCount++
         return le, nil
 }