Rename repository references (#8)

* Rename repository references

* Rename go modules

.github/pull_request_template.md

@@ -1,7 +1,7 @@
 <!--  Thanks for sending a pull request!  Here are some tips for you:
 
-1. Ensure that your code follows our code conventions: https://github.com/caraml-dev/observation-service/blob/master/CONTRIBUTING.md#code-style--linting
-2. Run unit tests and ensure that they are passing: https://github.com/caraml-dev/observation-service/blob/master/CONTRIBUTING.md#unit-tests
+1. Ensure that your code follows our code conventions: https://github.com/caraml-dev/timber/blob/master/CONTRIBUTING.md#code-style--linting
+2. Run unit tests and ensure that they are passing: https://github.com/caraml-dev/timber/blob/master/CONTRIBUTING.md#unit-tests
 3. Make sure documentation is updated for your PR
 
 -->

CONTRIBUTING.md

@@ -1,15 +1,15 @@
-# Development Guide: Contributing to Observation Service
+# Development Guide: Contributing to Timber
 
-Thank you for your interest in contributing to Observation Service. This document provides some suggestions and guidelines on how you can get involved.
+Thank you for your interest in contributing to Timber. This document provides some suggestions and guidelines on how you can get involved.
 
 ## Become a contributor
 
-You can contribute to Observation Service in several ways:
+You can contribute to Timber in several ways:
 
-- Contribute to feature development for the Observation Service codebase
+- Contribute to feature development for the Timber codebase
 - Report bugs
 - Create articles and documentation for users and contributors
-- Help others answer questions about Observation Service
+- Help others answer questions about Timber
 
 ### Report bugs
 
@@ -21,8 +21,8 @@ with a similar bug report. You can search the existing issues for similar issues
 
 ### Suggest features
 
-If you have an idea to improve Observation Service, submit a feature request. It will be good
-to describe the use cases and how it will benefit Observation Service users in your feature
+If you have an idea to improve Timber, submit a feature request. It will be good
+to describe the use cases and how it will benefit Timber users in your feature
 request.
 
 ## Making a pull request
@@ -32,7 +32,7 @@ You can submit pull requests to fix bugs, add new features or improve our docume
 Here are some considerations you should keep in mind when making changes:
 
 - While making changes
-  - Make your changes in a [forked repo](#forking-the-repo) (instead of making a branch on the main Observation Service repo)
+  - Make your changes in a [forked repo](#forking-the-repo) (instead of making a branch on the main Timber repo)
   - [Rebase from master](#incorporating-upstream-changes-from-master) instead of using `git pull` on your PR branch
   - Install [pre-commit hooks](#pre-commit-hooks) to ensure all the default linters / formatters are run when you push.
 - When making the PR
@@ -43,7 +43,7 @@ Here are some considerations you should keep in mind when making changes:
 
 ### Forking the repo
 
-Fork the Observation Service Github repo and clone your fork locally. Then make changes to a local branch to the fork.
+Fork the Timber Github repo and clone your fork locally. Then make changes to a local branch to the fork.
 
 See [Creating a pull request from a fork](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)
 
@@ -64,9 +64,9 @@ Setup [`pre-commit`](https://pre-commit.com/) to automatically lint and format t
 
 3. On push, the pre-commit hook will run. This runs `make format` and `make lint`.
 
-## Observation Service using Go
+## Timber using Go
 
-Observation service is written using Go, and the following describes how to setup your development environment.
+Timber is written using Go, and the following describes how to setup your development environment.
 
 ### Environment Setup
 

README.md

@@ -1,9 +1,11 @@
-# observation-service
+# timber
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue)](https://github.com/caraml-dev/observation-service/blob/master/LICENSE)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue)](https://github.com/caraml-dev/timber/blob/master/LICENSE)
 
 ## Overview
 
+Timber comprises of multiple services, central to logging in CaraML ecosystem.
+
 Observation Service provides an interface for reporting observations from Client-owned systems back to CaraML platform. The logged observations will be used for evaluating the effectiveness of a given prediction instance.
 
 ## Development Environment
@@ -50,6 +52,6 @@ grpcurl -plaintext localhost:9001 describe
 
 ## Contributing
 
-Observation Service is still under active development. Please have a look at our contributing and development guides if you want to contribute to the project:
+Timber is still under active development. Please have a look at our contributing and development guides if you want to contribute to the project:
 
-- [Contribution Process for Observation Service](https://github.com/caraml-dev/observation-service/blob/main/CONTRIBUTING.md)
+- [Contribution Process for Timber](https://github.com/caraml-dev/timber/blob/main/CONTRIBUTING.md)

common/config/config_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	tu "github.com/caraml-dev/observation-service/common/testutils"
+	tu "github.com/caraml-dev/timber/common/testutils"
 )
 
 func TestDefaultConfigs(t *testing.T) {

common/go.mod

@@ -1,4 +1,4 @@
-module github.com/caraml-dev/observation-service/common
+module github.com/caraml-dev/timber/common
 
 go 1.18
 

infra/charts/observation-service/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: observation-service
 description: Observation Service - Logging system for collecting ground truth observation result from ML prediction
-version: 0.1.0
+version: 0.1.1
 appVersion: 0.1.0
 maintainers:
 - email: caraml-dev@caraml.dev

infra/charts/observation-service/README.md

@@ -1,7 +1,7 @@
 # observation-service
 
 ---
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square)
 ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
 
 Observation Service - Logging system for collecting ground truth observation result from ML prediction
@@ -38,7 +38,7 @@ The following table lists the configurable parameters of the Observation Service
 | fluentd.gcpServiceAccount.enabled | bool | `false` | Flag to toggle flushing Observation logs to BQ |
 | fluentd.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | fluentd.image.registry | string | `"ghcr.io"` | Docker registry for Observation Service fluentd image |
-| fluentd.image.repository | string | `"caraml-dev/observation-service/fluentd"` | Docker image repository for Observation Service fluentd |
+| fluentd.image.repository | string | `"caraml-dev/timber/fluentd"` | Docker image repository for Observation Service fluentd |
 | fluentd.image.tag | string | `"v0.1.0"` | Docker image tag for Observation Service fluentd |
 | fluentd.pvcConfig | object | `{"mountPath":"/cache","name":"cache-volume","storage":"3Gi"}` | PVC configurations for fluentd StatefulSet storage |
 | fluentd.replicaCount | int | `1` |  |
@@ -56,7 +56,7 @@ The following table lists the configurable parameters of the Observation Service
 | observationService.extraLabels | object | `{}` | List of extra labels to add to Observation Service K8s resources |
 | observationService.image.pullPolicy | string | `"IfNotPresent"` | Docker image pull policy |
 | observationService.image.registry | string | `"ghcr.io"` | Docker registry for Observation Service image |
-| observationService.image.repository | string | `"caraml-dev/observation-service/observation-service"` | Docker image repository for Observation Service |
+| observationService.image.repository | string | `"caraml-dev/timber/observation-service"` | Docker image repository for Observation Service |
 | observationService.image.tag | string | `"v0.1.0"` | Docker image tag for Observation Service |
 | observationService.ingress.class | string | `""` | Ingress class annotation to add to this Ingress rule, useful when there are multiple ingress controllers installed |
 | observationService.ingress.enabled | bool | `false` | Enable ingress to provision Ingress resource for external access to Observation Service |

infra/charts/observation-service/values.yaml

@@ -3,7 +3,7 @@ observationService:
     # -- Docker registry for Observation Service image
     registry: ghcr.io
     # -- Docker image repository for Observation Service
-    repository: caraml-dev/observation-service/observation-service
+    repository: caraml-dev/timber/observation-service
     # -- Docker image tag for Observation Service
     tag: v0.1.0
     # -- Docker image pull policy
@@ -92,7 +92,7 @@ fluentd:
     # -- Docker registry for Observation Service fluentd image
     registry: ghcr.io
     # -- Docker image repository for Observation Service fluentd
-    repository: caraml-dev/observation-service/fluentd
+    repository: caraml-dev/timber/fluentd
     # -- Docker image tag for Observation Service fluentd
     tag: v0.1.0
     # -- Docker image pull policy

observation-service/appcontext/appcontext.go

@@ -1,10 +1,10 @@
 package appcontext
 
 import (
-	"github.com/caraml-dev/observation-service/observation-service/config"
-	"github.com/caraml-dev/observation-service/observation-service/log"
-	"github.com/caraml-dev/observation-service/observation-service/logger"
-	"github.com/caraml-dev/observation-service/observation-service/services"
+	"github.com/caraml-dev/timber/observation-service/config"
+	"github.com/caraml-dev/timber/observation-service/log"
+	"github.com/caraml-dev/timber/observation-service/logger"
+	"github.com/caraml-dev/timber/observation-service/services"
 )
 
 // AppContext captures the config of all related internal services to run Observation Service

observation-service/appcontext/appcontext_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/caraml-dev/observation-service/observation-service/config"
+	"github.com/caraml-dev/timber/observation-service/config"
 )
 
 func TestNewAppContext(t *testing.T) {

observation-service/cmd/observation-service/main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/caraml-dev/observation-service/observation-service/cmd"
+import "github.com/caraml-dev/timber/observation-service/cmd"
 
 func main() {
 	cmd.Execute()

observation-service/cmd/root.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/caraml-dev/observation-service/observation-service/log"
+	"github.com/caraml-dev/timber/observation-service/log"
 )
 
 // RootCmd represents the base command when called without any subcommands

observation-service/cmd/serve.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/caraml-dev/observation-service/observation-service/log"
-	"github.com/caraml-dev/observation-service/observation-service/server"
+	"github.com/caraml-dev/timber/observation-service/log"
+	"github.com/caraml-dev/timber/observation-service/server"
 )
 
 var cfgFile []string

observation-service/config/config.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gojek/mlp/api/pkg/instrumentation/newrelic"
 	"github.com/gojek/mlp/api/pkg/instrumentation/sentry"
 
-	common_config "github.com/caraml-dev/observation-service/common/config"
+	common_config "github.com/caraml-dev/timber/common/config"
 )
 
 // Config captures the config related to starting Observation Service

observation-service/controller/internal.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/heptiolabs/healthcheck"
 
-	"github.com/caraml-dev/observation-service/observation-service/config"
+	"github.com/caraml-dev/timber/observation-service/config"
 )
 
 // InternalController captures internal endpoints for service health/debugging purposes

observation-service/go.mod

@@ -1,10 +1,10 @@
-module github.com/caraml-dev/observation-service/observation-service
+module github.com/caraml-dev/timber/observation-service
 
 go 1.18
 
 require (
 	cloud.google.com/go/bigquery v1.43.0
-	github.com/caraml-dev/observation-service/common v0.0.0-00010101000000-000000000000
+	github.com/caraml-dev/timber/common v0.0.0-00010101000000-000000000000
 	github.com/caraml-dev/universal-prediction-interface v0.0.0-20221128075513-0b87b176b580
 	github.com/confluentinc/confluent-kafka-go v1.9.2
 	github.com/fluent/fluent-logger-golang v1.9.0
@@ -97,4 +97,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/caraml-dev/observation-service/common => ../common
+replace github.com/caraml-dev/timber/common => ../common

observation-service/integration-test/observation_it_test.go

@@ -18,8 +18,8 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"github.com/caraml-dev/observation-service/observation-service/log"
-	"github.com/caraml-dev/observation-service/observation-service/server"
+	"github.com/caraml-dev/timber/observation-service/log"
+	"github.com/caraml-dev/timber/observation-service/server"
 )
 
 type KafkaTopic string

observation-service/log/log.go

@@ -1,7 +1,7 @@
 package log
 
 import (
-	"github.com/caraml-dev/observation-service/observation-service/config"
+	"github.com/caraml-dev/timber/observation-service/config"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )

observation-service/logger/bigquery_producer.go

@@ -9,9 +9,9 @@ import (
 	"cloud.google.com/go/bigquery"
 	"go.einride.tech/protobuf-bigquery/encoding/protobq"
 
-	"github.com/caraml-dev/observation-service/observation-service/config"
-	"github.com/caraml-dev/observation-service/observation-service/log"
-	"github.com/caraml-dev/observation-service/observation-service/types"
+	"github.com/caraml-dev/timber/observation-service/config"
+	"github.com/caraml-dev/timber/observation-service/log"
+	"github.com/caraml-dev/timber/observation-service/types"
 	upiv1 "github.com/caraml-dev/universal-prediction-interface/gen/go/grpc/caraml/upi/v1"
 )
 

observation-service/logger/bigquery_producer_test.go

@@ -13,8 +13,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	tu "github.com/caraml-dev/observation-service/observation-service/internal/testutils"
-	"github.com/caraml-dev/observation-service/observation-service/types"
+	tu "github.com/caraml-dev/timber/observation-service/internal/testutils"
+	"github.com/caraml-dev/timber/observation-service/types"
 )
 
 type testSuiteBQSchema struct {

observation-service/logger/fluentd_producer.go

@@ -6,11 +6,11 @@ import (
 
 	"github.com/fluent/fluent-logger-golang/fluent"
 
-	"github.com/caraml-dev/observation-service/observation-service/config"
-	"github.com/caraml-dev/observation-service/observation-service/log"
-	"github.com/caraml-dev/observation-service/observation-service/monitoring"
-	"github.com/caraml-dev/observation-service/observation-service/services"
-	"github.com/caraml-dev/observation-service/observation-service/types"
+	"github.com/caraml-dev/timber/observation-service/config"
+	"github.com/caraml-dev/timber/observation-service/log"
+	"github.com/caraml-dev/timber/observation-service/monitoring"
+	"github.com/caraml-dev/timber/observation-service/services"
+	"github.com/caraml-dev/timber/observation-service/types"
 )
 
 // FluentdLogProducer captures configs for publishing ObservationLog via Fluentd to a configured sink

observation-service/logger/kafka_consumer.go

@@ -12,11 +12,11 @@ import (
 	"github.com/confluentinc/confluent-kafka-go/kafka"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/caraml-dev/observation-service/observation-service/config"
-	"github.com/caraml-dev/observation-service/observation-service/log"
-	"github.com/caraml-dev/observation-service/observation-service/monitoring"
-	"github.com/caraml-dev/observation-service/observation-service/services"
-	"github.com/caraml-dev/observation-service/observation-service/types"
+	"github.com/caraml-dev/timber/observation-service/config"
+	"github.com/caraml-dev/timber/observation-service/log"
+	"github.com/caraml-dev/timber/observation-service/monitoring"
+	"github.com/caraml-dev/timber/observation-service/services"
+	"github.com/caraml-dev/timber/observation-service/types"
 )
 
 type kafkaConsumer interface {

observation-service/logger/kafka_producer.go

@@ -7,11 +7,11 @@ import (
 
 	"github.com/confluentinc/confluent-kafka-go/kafka"
 
-	"github.com/caraml-dev/observation-service/observation-service/config"
-	"github.com/caraml-dev/observation-service/observation-service/log"
-	"github.com/caraml-dev/observation-service/observation-service/monitoring"
-	"github.com/caraml-dev/observation-service/observation-service/services"
-	"github.com/caraml-dev/observation-service/observation-service/types"
+	"github.com/caraml-dev/timber/observation-service/config"
+	"github.com/caraml-dev/timber/observation-service/log"
+	"github.com/caraml-dev/timber/observation-service/monitoring"
+	"github.com/caraml-dev/timber/observation-service/services"
+	"github.com/caraml-dev/timber/observation-service/types"
 )
 
 type kafkaProducer interface {

observation-service/logger/noop_consumer.go

@@ -1,6 +1,6 @@
 package logger
 
-import "github.com/caraml-dev/observation-service/observation-service/types"
+import "github.com/caraml-dev/timber/observation-service/types"
 
 // NoopLogConsumer is the struct for no operation to ObservationLog
 type NoopLogConsumer struct{}

observation-service/logger/noop_consumer_test.go

@@ -3,7 +3,7 @@ package logger
 import (
 	"testing"
 
-	"github.com/caraml-dev/observation-service/observation-service/types"
+	"github.com/caraml-dev/timber/observation-service/types"
 	"github.com/stretchr/testify/assert"
 )
 

observation-service/logger/noop_producer.go

@@ -1,6 +1,6 @@
 package logger
 
-import "github.com/caraml-dev/observation-service/observation-service/types"
+import "github.com/caraml-dev/timber/observation-service/types"
 
 // NoopLogProducer is the struct for no operation to ObservationLog
 type NoopLogProducer struct{}

observation-service/logger/observation_logger.go

@@ -6,11 +6,11 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/caraml-dev/observation-service/observation-service/config"
-	"github.com/caraml-dev/observation-service/observation-service/log"
-	"github.com/caraml-dev/observation-service/observation-service/monitoring"
-	"github.com/caraml-dev/observation-service/observation-service/services"
-	"github.com/caraml-dev/observation-service/observation-service/types"
+	"github.com/caraml-dev/timber/observation-service/config"
+	"github.com/caraml-dev/timber/observation-service/log"
+	"github.com/caraml-dev/timber/observation-service/monitoring"
+	"github.com/caraml-dev/timber/observation-service/services"
+	"github.com/caraml-dev/timber/observation-service/types"
 )
 
 const (