/**
 * Copyright 2015 Netflix, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package com.netflix.spectator.metrics3;

import com.netflix.spectator.api.AbstractTimer;
import com.netflix.spectator.api.Clock;
import com.netflix.spectator.api.Id;
import com.netflix.spectator.api.Measurement;

import java.util.Collections;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;

/** Timer implementation for the metrics3 registry. */
class MetricsTimer extends AbstractTimer {

  private final Id id;
  private final com.codahale.metrics.Timer impl;
  private final AtomicLong totalTime;

  /** Create a new instance. */
  MetricsTimer(Clock clock, Id id, com.codahale.metrics.Timer impl) {
    super(clock);
    this.id = id;
    this.impl = impl;
    this.totalTime = new AtomicLong(0L);
  }

  @Override public Id id() {
    return id;
  }

  @Override public boolean hasExpired() {
    return false;
  }

  @Override public void record(long amount, TimeUnit unit) {
    impl.update(amount, unit);
  }

  @Override public Iterable<Measurement> measure() {
    final long now = clock.wallTime();
    return Collections.singleton(new Measurement(id, now, impl.getMeanRate()));
  }

  @Override public long count() {
    return impl.getCount();
  }

  @Override public long totalTime() {
    return totalTime.get();
  }
}

@@ -1507,24 +1507,71 @@
 nit unit) %7B%0A
+    totalTime.addAndGet(unit.toNanos(amount));%0A
     impl.upd

update totalTime for metrics3 Timer (#580)